[Forensics-changes] [SCM] support for Expert Witness Compression format branch, debian, updated. debian/20080501+debian-1-6-g8e08a5d

[Daniel Baumann]

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

    Using quilt rather than dpatch.

diff --git a/debian/control b/debian/control
index e5f6307..2e41458 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 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, autotools-dev, libssl-dev, uuid-dev, zlib1g-dev
+Build-Depends: debhelper (>= 7), quilt, autotools-dev, libssl-dev, uuid-dev, zlib1g-dev
 Standards-Version: 3.8.0
 Homepage: https://www.uitwisselplatform.nl/projects/libewf/
 Vcs-Browser: http://git.debian.net/?p=debian-forensics/libewf.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9684aeb..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01-debian-directory.dpatch
diff --git a/debian/patches/01-debian-directory.dpatch b/debian/patches/01-debian-directory.patch
similarity index 77%
rename from debian/patches/01-debian-directory.dpatch
rename to debian/patches/01-debian-directory.patch
index 19c4164..f77405c 100644
--- a/debian/patches/01-debian-directory.dpatch
+++ b/debian/patches/01-debian-directory.patch
@@ -1,13 +1,9 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-## 01-debian-directory.dpatch by Daniel Baumann <daniel at debian.org>
-##
-## DP: Rebuild upstream-tarball without debian-directory.
+Author: Daniel Baumann <daniel at debian.org>
+Description: Rebuild upstream-tarball without debian-directory.
 
- at DPATCH@
-
-diff -Naurp libewf-20080501+debian.orig/Makefile.am libewf-20080501+debian/Makefile.am
---- libewf-20080501+debian.orig/Makefile.am	2008-05-02 06:34:55.000000000 +0000
-+++ libewf-20080501+debian/Makefile.am	2008-11-25 12:23:38.000000000 +0000
+diff -Naurp libewf.orig/Makefile.am libewf/Makefile.am
+--- libewf.orig/Makefile.am	2008-05-02 06:34:55.000000000 +0000
++++ libewf/Makefile.am	2008-11-25 12:23:38.000000000 +0000
 @@ -93,7 +93,6 @@ REDHAT_FILES = \
  
  EXTRA_DIST = \
@@ -25,9 +21,9 @@ diff -Naurp libewf-20080501+debian.orig/Makefile.am libewf-20080501+debian/Makef
  	/bin/rm -f macosx/Introduction.rtf
  	@for dir in ${subdirs}; do \
  		(cd $$dir && $(MAKE) distclean) \
-diff -Naurp libewf-20080501+debian.orig/Makefile.in libewf-20080501+debian/Makefile.in
---- libewf-20080501+debian.orig/Makefile.in	2008-05-02 06:35:28.000000000 +0000
-+++ libewf-20080501+debian/Makefile.in	2008-11-25 12:23:44.000000000 +0000
+diff -Naurp libewf.orig/Makefile.in libewf/Makefile.in
+--- libewf.orig/Makefile.in	2008-05-02 06:35:28.000000000 +0000
++++ libewf/Makefile.in	2008-11-25 12:23:44.000000000 +0000
 @@ -38,8 +38,6 @@ DIST_COMMON = README $(am__configure_dep
  	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/libewf.pc.in \
@@ -74,9 +70,9 @@ diff -Naurp libewf-20080501+debian.orig/Makefile.in libewf-20080501+debian/Makef
  	/bin/rm -f macosx/Introduction.rtf
  	@for dir in ${subdirs}; do \
  		(cd $$dir && $(MAKE) distclean) \
-diff -Naurp libewf-20080501+debian.orig/configure libewf-20080501+debian/configure
---- libewf-20080501+debian.orig/configure	2008-05-02 06:35:19.000000000 +0000
-+++ libewf-20080501+debian/configure	2008-11-25 12:22:53.000000000 +0000
+diff -Naurp libewf.orig/configure libewf/configure
+--- libewf.orig/configure	2008-05-02 06:35:19.000000000 +0000
++++ libewf/configure	2008-11-25 12:22:53.000000000 +0000
 @@ -34236,10 +34236,6 @@ ac_config_files="$ac_config_files includ
  
  ac_config_files="$ac_config_files include/libewf/types.h"
@@ -97,9 +93,9 @@ diff -Naurp libewf-20080501+debian.orig/configure libewf-20080501+debian/configu
      "macosx/Introduction.rtf") CONFIG_FILES="$CONFIG_FILES macosx/Introduction.rtf" ;;
      "libewf.pc") CONFIG_FILES="$CONFIG_FILES libewf.pc" ;;
      "libewf.spec") CONFIG_FILES="$CONFIG_FILES libewf.spec" ;;
-diff -Naurp libewf-20080501+debian.orig/configure.ac libewf-20080501+debian/configure.ac
---- libewf-20080501+debian.orig/configure.ac	2008-05-01 12:31:31.000000000 +0000
-+++ libewf-20080501+debian/configure.ac	2008-11-25 12:23:01.000000000 +0000
+diff -Naurp libewf.orig/configure.ac libewf/configure.ac
+--- libewf.orig/configure.ac	2008-05-01 12:31:31.000000000 +0000
++++ libewf/configure.ac	2008-11-25 12:23:01.000000000 +0000
 @@ -651,8 +651,6 @@ AC_CONFIG_FILES([include/libewf.h])
  AC_CONFIG_FILES([include/libewf/definitions.h])
  AC_CONFIG_FILES([include/libewf/types.h])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6cf7d39
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-debian-directory.patch
diff --git a/debian/rules b/debian/rules
index 49e8f9d..bff9a3b 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
 
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -12,7 +12,7 @@ else
 endif
 
 clean: clean-patched unpatch
-clean-patched: patch-stamp
+clean-patched: patch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
@@ -22,7 +22,7 @@ clean-patched: patch-stamp
 
 	dh_clean
 
-config.status: configure patch-stamp
+config.status: configure patch
 	dh_testdir
 
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""

-- 
support for Expert Witness Compression format