[Forensics-changes] [SCM] recover files/disks with damaged sectors branch, debian, updated. debian/0.19-2-4-g1192f2d

Daniel Baumann daniel at debian.org
Sat Jan 10 19:49:48 UTC 2009


The following commit has been merged in the debian branch:
commit 40d6e3fc9fdd009025ad68ed2f6b08b086493e82
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jan 10 20:41:48 2009 +0100

    Using quilt rather than dpatch.

diff --git a/debian/control b/debian/control
index 93209a1..544ddf9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 7), dpatch
+Build-Depends: debhelper (>= 7), quilt
 Standards-Version: 3.8.0
 Homepage: http://www.vanheusden.com/recoverdm/
 Vcs-Browser: http://git.debian.net/?p=debian-forensics/recoverdm.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 54ee151..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-manpage.dpatch
diff --git a/debian/patches/01-manpage.dpatch b/debian/patches/01-manpage.patch
similarity index 91%
rename from debian/patches/01-manpage.dpatch
rename to debian/patches/01-manpage.patch
index 833b0f2..5e45da9 100644
--- a/debian/patches/01-manpage.dpatch
+++ b/debian/patches/01-manpage.patch
@@ -1,9 +1,5 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-manpage.dpatch by A. Costa <agcosta at gis.net>
-##
-## DP: Fix manpage spelling errors (Closes: #504541).
-
- at DPATCH@
+Author: A. Costa <agcosta at gis.net>
+Description: Fix manpage spelling errors (Closes: #504541).
 
 diff -Naurp recoverdm.orig/recoverdm.1 recoverdm/recoverdm.1
 --- recoverdm.orig/recoverdm.1	2008-10-19 15:07:11.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9d05b2b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-manpage.patch
diff --git a/debian/rules b/debian/rules
index 0bc172e..4956bd9 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
 
 	$(MAKE)

-- 
recover files/disks with damaged sectors



More information about the forensics-changes mailing list