[Forensics-changes] [SCM] Forensics related utilities branch, debian, updated. debian/1.18-2-3-g33d2a09

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 9aa7bf5b01c5b29e96e498673b8780b3c9ec49cf
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu May 28 22:49:42 2009 +0200

    Using quilt rather than dpatch.

diff --git a/debian/control b/debian/control
index 169b058..89cedd0 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: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 7), dpatch, e2fslibs-dev
+Build-Depends: debhelper (>= 7), quilt, e2fslibs-dev
 Standards-Version: 3.8.0
 Homepage: http://www.porcupine.org/forensics/tct.html
 Vcs-Browser: http://git.debian.net/?p=debian-forensics/tct.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 4926043..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-conglomeration.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 cfc9fdc..ad400e3 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: Needs to be broken out (FIXME).
-
- at DPATCH@
+Author: n/a
+Description: Needs to be broken out (FIXME).
 
 diff -Naurp tct.orig/bin/grave-robber tct/bin/grave-robber
 --- tct.orig/bin/grave-robber	2007-01-21 22:18:00.000000000 +0000
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a710074
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-conglomeration.patch
diff --git a/debian/rules b/debian/rules
index 28f8da2..d29c530 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
@@ -22,7 +22,7 @@ clean: unpatch
 	dh_clean
 
 build: build-stamp
-build-stamp: patch-stamp
+build-stamp: patch
 	dh_testdir
 
 	$(MAKE) OPT="$(CFLAGS)" DEBUG=-g

-- 
Forensics related utilities