[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.10+dfsg-1-14-gf304d20

[Christophe Monniez]

The following commit has been merged in the debian branch:
commit e6863bd2edac3bb62d6590d4c4eea6b437b65d72
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Tue May 4 13:40:22 2010 +0200

    Removing obsolete patches.

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
new file mode 100644
index 0000000..6857a8d
--- /dev/null
+++ b/.pc/.quilt_patches
@@ -0,0 +1 @@
+debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
new file mode 100644
index 0000000..c206706
--- /dev/null
+++ b/.pc/.quilt_series
@@ -0,0 +1 @@
+series
diff --git a/.pc/.version b/.pc/.version
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/.pc/.version
@@ -0,0 +1 @@
+2
diff --git a/configure.ac.rej b/configure.ac.rej
new file mode 100644
index 0000000..b9937de
--- /dev/null
+++ b/configure.ac.rej
@@ -0,0 +1,11 @@
+--- configure.ac
++++ configure.ac
+@@ -33,8 +33,6 @@
+ AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile 
+ 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
+ dnl Have configure make distribution specific files
+-AC_CONFIG_FILES([debian/changelog])
+-AC_CONFIG_FILES([debian/shlibs.local.ex])
+ AC_CONFIG_FILES([afflib.spec])
+ dnl Have configure write its configuration
+ AM_CONFIG_HEADER([affconfig.h])
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
deleted file mode 100644
index a633bf3..0000000
--- a/debian/patches/01-debian-directory.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Daniel Baumann <daniel at debian.org>
-Description: Rebuilding upstream tarball without debian directory.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -100,7 +100,6 @@
- 	doc/announce_2.2.txt
- 
- EXTRA_DIST = $(DOCS) \
--	$(DEBIAN_FILES) \
- 	acx_pthread.m4 \
- 	afflib.spec.in \
- 	afflib.spec \
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,8 +33,6 @@
- AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile 
- 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
- dnl Have configure make distribution specific files
--AC_CONFIG_FILES([debian/changelog])
--AC_CONFIG_FILES([debian/shlibs.local.ex])
- AC_CONFIG_FILES([afflib.spec])
- dnl Have configure write its configuration
- AM_CONFIG_HEADER([affconfig.h])
diff --git a/debian/patches/04-fix-afdiskprint.patch b/debian/patches/01-fix-afdiskprint.patch
similarity index 100%
rename from debian/patches/04-fix-afdiskprint.patch
rename to debian/patches/01-fix-afdiskprint.patch
diff --git a/debian/patches/02-win32-files.patch b/debian/patches/02-win32-files.patch
deleted file mode 100644
index 533c6ae..0000000
--- a/debian/patches/02-win32-files.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Author: Daniel Baumann <daniel at debian.org>
-Description: Rebuilding upstream tarball without win32 files.
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,4 +1,4 @@
--SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
-+SUBDIRS = lib tools lzma443 tests doc pyaff man
- 
- pkgconfigdir = $(libdir)/pkgconfig
- 
---- a/configure.ac
-+++ b/configure.ac
-@@ -30,7 +30,7 @@
- 
- # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
- # AC_PROG_RANLIB
--AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile 
-+AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile
- 			  tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h])
- dnl Have configure make distribution specific files
- AC_CONFIG_FILES([afflib.spec])
diff --git a/debian/patches/03-bashism.patch b/debian/patches/03-bashism.patch
deleted file mode 100644
index 6d886b1..0000000
--- a/debian/patches/03-bashism.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Christophe Monniez <christophe.monniez at fccu.be>
-Description: fix some bashisms detected by checkbashisms script.
-
---- a/tools/test_make_random_iso.sh
-+++ b/tools/test_make_random_iso.sh
-@@ -5,7 +5,7 @@
- 
- unset AFFLIB_PASSPHRASE
- 
--if [ x"" = x$1 ] ; 
-+if test "x" = "x$1" ;
-   then echo usage: $0 filename
-   exit 1
- fi
diff --git a/debian/patches/series b/debian/patches/series
index 540cadb..93eaaf4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-01-debian-directory.patch
-02-win32-files.patch
-03-bashism.patch
-04-fix-afdiskprint.patch
+01-fix-afdiskprint.patch

-- 
debian-forensics/afflib