[Forensics-changes] [SCM] Guess PC disk partition table, find lost partitions branch, debian, updated. debian/0.1h-7-7-ge0e4efc

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 8551b6b7d271ccf58d7eef1e0b3539a3cbe1ef24
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 28 21:20:32 2009 +0200

    Using quilt rather than dpatch.

diff --git a/debian/control b/debian/control
index 2dc2bbf..ad0c39f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Daniel Baumann <daniel at debian.org>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7), quilt
 Standards-Version: 3.8.1
 Homepage: http://home.pages.de/~michab/gpart/
 Vcs-Browser: http://git.debian.net/?p=debian-forensics/gpart.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 5e0cc8c..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01-conglomeration.dpatch
-02-ntfs-winxp.dpatch
-03-open-mode.dpatch
diff --git a/debian/patches/01-conglomeration.dpatch b/debian/patches/01-conglomeration.patch
similarity index 99%
rename from debian/patches/01-conglomeration.dpatch
rename to debian/patches/01-conglomeration.patch
index f519080..2228d12 100644
--- a/debian/patches/01-conglomeration.dpatch
+++ b/debian/patches/01-conglomeration.patch
@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-conglomeration.dpatch
-##
-## DP: FIXME: Needs to be broken out.
-
- at DPATCH@
+Author: n/a
+Description: Needs to be broken out (FIXME).
 
 diff -Naurp gpart.orig/Makefile gpart/Makefile
 --- gpart.orig/Makefile	2000-12-13 22:45:49.000000000 +0000
diff --git a/debian/patches/02-ntfs-winxp.dpatch b/debian/patches/02-ntfs-winxp.dpatch
deleted file mode 100644
index fccf360..0000000
--- a/debian/patches/02-ntfs-winxp.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 02-ntfs-winxp.dpatch by Trace Green <debian.y.h.xu at gmail.com>
-##
-## DP: Support for NTFS of Windows XP (Closes: #474321).
-
- at DPATCH@
-
-diff -Naurp gpart-0.1h.orig/src/gm_ntfs.c gpart-0.1h/src/gm_ntfs.c
---- gpart-0.1h.orig/src/gm_ntfs.c	2001-02-07 18:08:08.000000000 +0000
-+++ gpart-0.1h/src/gm_ntfs.c	2008-11-06 15:20:09.000000000 +0000
-@@ -73,9 +73,11 @@ int ntfs_gfun(disk_desc *d,g_module *m)
- 			return (1);
- 		size = NTFS_GETU64(d->d_sbuf + 0x28);
- 
-+#if 0
- 		size /= clusterfactor;
- 		size *= clustersize;
- 		size /= d->d_ssize;
-+#endif
- 
- 		/*
- 		 * look for an additional backup boot sector at the end of
diff --git a/debian/patches/02-ntfs-winxp.patch b/debian/patches/02-ntfs-winxp.patch
new file mode 100644
index 0000000..21f9d31
--- /dev/null
+++ b/debian/patches/02-ntfs-winxp.patch
@@ -0,0 +1,18 @@
+Author: Trace Green <debian.y.h.xu at gmail.com>
+Description: Support for NTFS of Windows XP (Closes: #474321).
+
+diff -Naurp gpart.orig/src/gm_ntfs.c gpart/src/gm_ntfs.c
+--- gpart.orig/src/gm_ntfs.c	2001-02-07 18:08:08.000000000 +0000
++++ gpart/src/gm_ntfs.c	2008-11-06 15:20:09.000000000 +0000
+@@ -73,9 +73,11 @@ int ntfs_gfun(disk_desc *d,g_module *m)
+ 			return (1);
+ 		size = NTFS_GETU64(d->d_sbuf + 0x28);
+ 
++#if 0
+ 		size /= clusterfactor;
+ 		size *= clustersize;
+ 		size /= d->d_ssize;
++#endif
+ 
+ 		/*
+ 		 * look for an additional backup boot sector at the end of
diff --git a/debian/patches/03-open-mode.dpatch b/debian/patches/03-open-mode.patch
similarity index 71%
rename from debian/patches/03-open-mode.dpatch
rename to debian/patches/03-open-mode.patch
index 9739f2f..6f85271 100644
--- a/debian/patches/03-open-mode.dpatch
+++ b/debian/patches/03-open-mode.patch
@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 03-open-mode.dpatch by James Westby <james.westby at canonical.com>
-##
-## DP: Specify a mode to open(2) as required (Closes: #506816).
-
- at DPATCH@
+Author: James Westby <james.westby at canonical.com>
+Description: Specify a mode to open(2) as required (Closes: #506816).
 
 diff -Naurp gpart.orig/src/gpart.c gpart/src/gpart.c
 --- gpart.orig/src/gpart.c	2008-10-19 15:06:06.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..853ff37
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-conglomeration.patch
+02-ntfs-winxp.patch
+03-open-mode.patch
diff --git a/debian/rules b/debian/rules
index 7a43dc8..298f69d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
 clean: unpatch
 	dh_testdir
@@ -12,7 +12,7 @@ clean: unpatch
 	dh_clean
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: patch
 	dh_testdir
 
 	CFLAGS="$(CFLAGS)" $(MAKE) DEBUG=1

-- 
Guess PC disk partition table, find lost partitions