[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.0+dfsg-1-2-gecae4a5
Christophe Monniez
christophe.monniez at fccu.be
Sun Oct 25 10:35:44 UTC 2009
The following commit has been merged in the debian branch:
commit ecae4a5a39d333d2af3faabecd9d31e60e8fc32d
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date: Sun Oct 25 11:39:53 2009 +0100
Refreshing quilt patches.
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index 2a5a5c7..c45e910 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -3,8 +3,8 @@ Description: Rebuilding upstream tarball without debian directory.
Index: afflib/Makefile.am
===================================================================
---- afflib.orig/Makefile.am 2009-10-04 16:12:10.000000000 +0200
-+++ afflib/Makefile.am 2009-10-05 17:32:55.794984657 +0200
+--- afflib.orig/Makefile.am 2009-10-25 11:15:41.359881152 +0100
++++ afflib/Makefile.am 2009-10-25 11:37:44.442887454 +0100
@@ -100,7 +100,6 @@
doc/announce_2.2.txt
@@ -15,9 +15,9 @@ Index: afflib/Makefile.am
afflib.spec \
Index: afflib/Makefile.in
===================================================================
---- afflib.orig/Makefile.in 2009-10-05 06:03:44.000000000 +0200
-+++ afflib/Makefile.in 2009-10-05 17:32:55.851007631 +0200
-@@ -40,8 +40,7 @@
+--- afflib.orig/Makefile.in 2009-10-25 11:15:41.359881152 +0100
++++ afflib/Makefile.in 2009-10-25 11:37:44.446880564 +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 \
@@ -27,16 +27,16 @@ Index: afflib/Makefile.in
ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -56,7 +55,7 @@
+@@ -54,7 +53,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
- CONFIG_CLEAN_VPATH_FILES =
SOURCES =
-@@ -340,7 +339,6 @@
+ DIST_SOURCES =
+@@ -295,7 +294,6 @@
doc/announce_2.2.txt
EXTRA_DIST = $(DOCS) \
@@ -46,9 +46,9 @@ Index: afflib/Makefile.in
afflib.spec \
Index: afflib/configure
===================================================================
---- afflib.orig/configure 2009-10-05 06:03:30.000000000 +0200
-+++ afflib/configure 2009-10-05 17:32:55.874972439 +0200
-@@ -11478,10 +11478,6 @@
+--- afflib.orig/configure 2009-10-25 11:15:41.375879296 +0100
++++ afflib/configure 2009-10-25 11:37:44.466878731 +0100
+@@ -11838,10 +11838,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"
@@ -59,7 +59,7 @@ Index: afflib/configure
ac_config_files="$ac_config_files afflib.spec"
ac_config_headers="$ac_config_headers affconfig.h"
-@@ -19245,8 +19241,6 @@
+@@ -23136,8 +23132,6 @@
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
@@ -70,8 +70,8 @@ Index: afflib/configure
"afflib.pc") CONFIG_FILES="$CONFIG_FILES afflib.pc" ;;
Index: afflib/configure.ac
===================================================================
---- afflib.orig/configure.ac 2009-10-04 01:12:56.000000000 +0200
-+++ afflib/configure.ac 2009-10-05 17:32:55.931004697 +0200
+--- afflib.orig/configure.ac 2009-10-25 11:15:41.379880788 +0100
++++ afflib/configure.ac 2009-10-25 11:37:44.466878731 +0100
@@ -34,8 +34,6 @@
AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile
tests/Makefile doc/Makefile pyaff/Makefile man/Makefile])
diff --git a/debian/patches/02-win32-files.patch b/debian/patches/02-win32-files.patch
index fbce3cd..2b6063a 100644
--- a/debian/patches/02-win32-files.patch
+++ b/debian/patches/02-win32-files.patch
@@ -3,8 +3,8 @@ Description: Rebuilding upstream tarball without win32 files.
Index: afflib/Makefile.am
===================================================================
---- afflib.orig/Makefile.am 2009-10-05 17:31:20.114972720 +0200
-+++ afflib/Makefile.am 2009-10-05 17:31:20.162972527 +0200
+--- afflib.orig/Makefile.am 2009-10-25 11:37:44.442887454 +0100
++++ afflib/Makefile.am 2009-10-25 11:38:23.783878780 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
+SUBDIRS = lib tools lzma443 tests doc pyaff man
@@ -13,10 +13,10 @@ Index: afflib/Makefile.am
Index: afflib/Makefile.in
===================================================================
---- afflib.orig/Makefile.in 2009-10-05 17:31:20.114972720 +0200
-+++ afflib/Makefile.in 2009-10-05 17:31:20.162972527 +0200
-@@ -277,7 +277,7 @@
- top_build_prefix = @top_build_prefix@
+--- afflib.orig/Makefile.in 2009-10-25 11:37:44.446880564 +0100
++++ afflib/Makefile.in 2009-10-25 11:38:23.787878455 +0100
+@@ -232,7 +232,7 @@
+ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
@@ -26,9 +26,9 @@ Index: afflib/Makefile.in
include_HEADERS =
Index: afflib/configure
===================================================================
---- afflib.orig/configure 2009-10-05 17:31:20.134972215 +0200
-+++ afflib/configure 2009-10-05 17:31:20.178971857 +0200
-@@ -11476,7 +11476,7 @@
+--- afflib.orig/configure 2009-10-25 11:37:44.466878731 +0100
++++ afflib/configure 2009-10-25 11:38:23.807878231 +0100
+@@ -11836,7 +11836,7 @@
# AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
# AC_PROG_RANLIB
@@ -37,7 +37,7 @@ Index: afflib/configure
ac_config_files="$ac_config_files afflib.spec"
-@@ -19236,7 +19236,6 @@
+@@ -23127,7 +23127,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" ;;
@@ -47,8 +47,8 @@ Index: afflib/configure
"pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
Index: afflib/configure.ac
===================================================================
---- afflib.orig/configure.ac 2009-10-05 17:31:20.134972215 +0200
-+++ afflib/configure.ac 2009-10-05 17:31:20.182972440 +0200
+--- afflib.orig/configure.ac 2009-10-25 11:37:44.466878731 +0100
++++ afflib/configure.ac 2009-10-25 11:38:23.807878231 +0100
@@ -31,7 +31,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 5b81fa4..3f7b574 100644
--- a/debian/patches/03-bashism.patch
+++ b/debian/patches/03-bashism.patch
@@ -1,9 +1,9 @@
Index: afflib/tools/test_afsegment.sh
===================================================================
---- afflib.orig/tools/test_afsegment.sh 2009-10-06 16:03:33.206734197 +0200
-+++ afflib/tools/test_afsegment.sh 2009-10-06 17:44:17.366698760 +0200
-@@ -4,7 +4,7 @@
- echo === Putting a new metadata segment into blank.aff ===
+--- afflib.orig/tools/test_afsegment.sh 2009-10-25 11:15:41.464031184 +0100
++++ afflib/tools/test_afsegment.sh 2009-10-25 11:38:45.382878537 +0100
+@@ -7,7 +7,7 @@
+ /bin/rm -f blank.aff
./afcopy /dev/null blank.aff
./afsegment -ssegname=testseg1 blank.aff
-if [ x"testseg1" = x`./afsegment -p segname blank.aff` ] ; then
@@ -13,8 +13,8 @@ Index: afflib/tools/test_afsegment.sh
echo afsegment does not work properly
Index: afflib/tools/test_passphrase.sh
===================================================================
---- afflib.orig/tools/test_passphrase.sh 2009-10-06 16:03:33.242698523 +0200
-+++ afflib/tools/test_passphrase.sh 2009-10-06 17:44:17.366698760 +0200
+--- afflib.orig/tools/test_passphrase.sh 2009-10-25 11:15:41.464031184 +0100
++++ afflib/tools/test_passphrase.sh 2009-10-25 11:38:45.382878537 +0100
@@ -33,7 +33,7 @@
echo "doc" >> words
echo "passphrase" >> words
@@ -26,11 +26,11 @@ Index: afflib/tools/test_passphrase.sh
else
Index: afflib/tools/test_crypto.sh
===================================================================
---- afflib.orig/tools/test_crypto.sh 2009-10-06 17:44:26.230698439 +0200
-+++ afflib/tools/test_crypto.sh 2009-10-06 17:45:29.487665159 +0200
-@@ -2,11 +2,11 @@
- #
- # test to make sure we haven't broken encryption...
+--- afflib.orig/tools/test_crypto.sh 2009-10-25 11:15:41.464031184 +0100
++++ afflib/tools/test_crypto.sh 2009-10-25 11:38:45.382878537 +0100
+@@ -4,11 +4,11 @@
+
+ unset AFFLIB_PASSPHRASE
-if [ x${srcdir} == "x" ] ;
+if test "x${srcdir}" = "x" ;
--
debian-forensics/afflib
More information about the forensics-changes
mailing list