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

Cristian Greco cristian at regolo.cc
Sat Apr 10 00:03:24 UTC 2010 

The following commit has been merged in the debian branch:
commit 33ff9ac3a2881c3547c0a97608d72df0c03948bb
Author: Cristian Greco <cristian at regolo.cc>
Date:   Fri Apr 9 19:05:58 2010 +0200

    debian/patches: refreshed and modified all patches, then let debian/rules calls
    autoreconf.
    
    Refresh all patches (using QUILT_REFRESH_ARGS="-p ab --no-timestamps
    --no-index"), then make all patches apply only on configure.ac and Makefile.am
    files, and let debian/rules calls autoreconf at build time. Now there is no
    need to remove config.{sub,guess} at `clean` target.

diff --git a/debian/control b/debian/control
index e1b2c06..16ce32e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,9 @@ Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
 Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~),
- autotools-dev,
+# needed to run autoreconf on debian/rules
+ automake, autoconf, libtool,
+#
  libcurl4-openssl-dev,
  libexpat1-dev,
  libewf-dev,
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index 1320b49..a633bf3 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -1,10 +1,8 @@
 Author: Daniel Baumann <daniel at debian.org>
 Description: Rebuilding upstream tarball without debian directory.
 
-Index: afflib/Makefile.am
-===================================================================
---- afflib.orig/Makefile.am	2009-12-19 16:48:22.000000000 +0100
-+++ afflib/Makefile.am	2010-01-17 18:19:46.583184830 +0100
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -100,7 +100,6 @@
  	doc/announce_2.2.txt
  
@@ -13,65 +11,8 @@ Index: afflib/Makefile.am
  	acx_pthread.m4 \
  	afflib.spec.in \
  	afflib.spec \
-Index: afflib/Makefile.in
-===================================================================
---- afflib.orig/Makefile.in	2010-01-17 18:16:24.242174432 +0100
-+++ afflib/Makefile.in	2010-01-17 18:19:46.583184830 +0100
-@@ -38,8 +38,7 @@
- 	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
- 	$(srcdir)/Makefile.in $(srcdir)/affconfig.h.in \
- 	$(srcdir)/afflib.pc.in $(srcdir)/afflib.spec.in \
--	$(top_srcdir)/configure $(top_srcdir)/debian/changelog.in \
--	$(top_srcdir)/debian/shlibs.local.ex.in AUTHORS COPYING \
-+	$(top_srcdir)/configure AUTHORS COPYING \
- 	ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
- 	install-sh ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,7 +50,7 @@
-  configure.lineno config.status.lineno
- mkinstalldirs = $(install_sh) -d
- CONFIG_HEADER = affconfig.h
--CONFIG_CLEAN_FILES = debian/changelog debian/shlibs.local.ex \
-+CONFIG_CLEAN_FILES = \
- 	afflib.spec afflib.pc
- SOURCES =
- DIST_SOURCES =
-@@ -292,7 +291,6 @@
- 	doc/announce_2.2.txt
- 
- EXTRA_DIST = $(DOCS) \
--	$(DEBIAN_FILES) \
- 	acx_pthread.m4 \
- 	afflib.spec.in \
- 	afflib.spec \
-Index: afflib/configure
-===================================================================
---- afflib.orig/configure	2010-01-17 18:16:24.266171784 +0100
-+++ afflib/configure	2010-01-17 18:19:46.599173872 +0100
-@@ -11833,10 +11833,6 @@
- # AC_PROG_RANLIB
- ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
- 
--ac_config_files="$ac_config_files debian/changelog"
--
--ac_config_files="$ac_config_files debian/shlibs.local.ex"
--
- ac_config_files="$ac_config_files afflib.spec"
- 
- ac_config_headers="$ac_config_headers affconfig.h"
-@@ -23234,8 +23230,6 @@
-     "pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
-     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-     "lib/version.h") CONFIG_FILES="$CONFIG_FILES lib/version.h" ;;
--    "debian/changelog") CONFIG_FILES="$CONFIG_FILES debian/changelog" ;;
--    "debian/shlibs.local.ex") CONFIG_FILES="$CONFIG_FILES debian/shlibs.local.ex" ;;
-     "afflib.spec") CONFIG_FILES="$CONFIG_FILES afflib.spec" ;;
-     "affconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS affconfig.h" ;;
-     "afflib.pc") CONFIG_FILES="$CONFIG_FILES afflib.pc" ;;
-Index: afflib/configure.ac
-===================================================================
---- afflib.orig/configure.ac	2010-01-17 18:16:24.266171784 +0100
-+++ afflib/configure.ac	2010-01-17 18:19:46.603171953 +0100
+--- 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])
diff --git a/debian/patches/02-win32-files.patch b/debian/patches/02-win32-files.patch
index c05b1a2..533c6ae 100644
--- a/debian/patches/02-win32-files.patch
+++ b/debian/patches/02-win32-files.patch
@@ -1,54 +1,16 @@
 Author: Daniel Baumann <daniel at debian.org>
 Description: Rebuilding upstream tarball without win32 files.
 
-Index: afflib/Makefile.am
-===================================================================
---- afflib.orig/Makefile.am	2010-01-17 18:19:46.583184830 +0100
-+++ afflib/Makefile.am	2010-01-17 18:20:03.139174718 +0100
+--- 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
  
-Index: afflib/Makefile.in
-===================================================================
---- afflib.orig/Makefile.in	2010-01-17 18:19:46.583184830 +0100
-+++ afflib/Makefile.in	2010-01-17 18:20:03.139174718 +0100
-@@ -229,7 +229,7 @@
- target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
-+SUBDIRS = lib tools lzma443 tests doc pyaff man
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = afflib.pc
- include_HEADERS = 
-Index: afflib/configure
-===================================================================
---- afflib.orig/configure	2010-01-17 18:19:46.599173872 +0100
-+++ afflib/configure	2010-01-17 18:20:03.155206153 +0100
-@@ -11831,7 +11831,7 @@
- 
- # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
- # AC_PROG_RANLIB
--ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
-+ac_config_files="$ac_config_files Makefile lib/Makefile tools/Makefile lzma443/Makefile tests/Makefile doc/Makefile pyaff/Makefile man/Makefile lib/version.h"
- 
- ac_config_files="$ac_config_files afflib.spec"
- 
-@@ -23224,7 +23224,6 @@
-     "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-     "lzma443/Makefile") CONFIG_FILES="$CONFIG_FILES lzma443/Makefile" ;;
--    "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
-     "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
-     "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-     "pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
-Index: afflib/configure.ac
-===================================================================
---- afflib.orig/configure.ac	2010-01-17 18:19:46.603171953 +0100
-+++ afflib/configure.ac	2010-01-17 18:20:03.159181325 +0100
+--- a/configure.ac
++++ b/configure.ac
 @@ -30,7 +30,7 @@
  
  # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
diff --git a/debian/patches/03-bashism.patch b/debian/patches/03-bashism.patch
index 0ad7a24..c758216 100644
--- a/debian/patches/03-bashism.patch
+++ b/debian/patches/03-bashism.patch
@@ -1,7 +1,5 @@
-Index: afflib/tools/test_make_random_iso.sh
-===================================================================
---- afflib.orig/tools/test_make_random_iso.sh	2009-12-14 03:59:00.000000000 +0100
-+++ afflib/tools/test_make_random_iso.sh	2010-01-17 18:20:18.195173325 +0100
+--- a/tools/test_make_random_iso.sh
++++ b/tools/test_make_random_iso.sh
 @@ -5,7 +5,7 @@
  
  unset AFFLIB_PASSPHRASE
diff --git a/debian/rules b/debian/rules
index aaebf91..57da648 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,26 @@
 #!/usr/bin/make -f
 
 %:
-	dh ${@} --with quilt
+	dh --with quilt ${@}
 
 dfsg:
 	rm -rf misc win32
 
 override_dh_auto_clean:
+	rm -rf m4
 	dh_auto_clean
 
-	rm -f config.guess config.sub
-
 override_dh_auto_configure:
-	cp -f /usr/share/misc/config.guess .
-	cp -f /usr/share/misc/config.sub .
-
+	mkdir -p m4 #needed due to bad configure.ac
+	autoreconf -f -i
 	dh_auto_configure -- --enable-s3=yes --enable-python=no --enable-libewf=yes LDFLAGS="-Wl,-z,defs"
 
 override_dh_install:
 	mv debian/tmp/usr/bin/s3 debian/tmp/usr/bin/s3-afflib;
-
 	dh_install --fail-missing
 
 override_dh_auto_test:
 	# do nothing
 
-override_dh_strip:
+override_dh_strip:	
 	dh_strip --dbg-package=afflib-dbg

-- 
debian-forensics/afflib

More information about the forensics-changes mailing list