[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.5+dfsg-1-3-g5498406
Christophe Monniez
christophe.monniez at fccu.be
Thu Jan 7 12:14:25 UTC 2010
The following commit has been merged in the debian branch:
commit 5498406c22b7fea5b5e30b61925e09028b13fdcc
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date: Thu Jan 7 13:13:19 2010 +0100
Refreshing quilt patches.
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index b92e274..667f75b 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-12-27 12:03:57.391901658 +0100
-+++ afflib/Makefile.am 2009-12-27 12:10:50.039902269 +0100
+--- afflib.orig/Makefile.am 2009-12-19 16:48:22.000000000 +0100
++++ afflib/Makefile.am 2010-01-07 13:12:08.774316137 +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-12-27 12:03:57.391901658 +0100
-+++ afflib/Makefile.in 2009-12-27 12:10:50.107938247 +0100
-@@ -38,8 +38,7 @@
+--- afflib.orig/Makefile.in 2010-01-07 13:07:17.778286376 +0100
++++ afflib/Makefile.in 2010-01-07 13:12:08.774316137 +0100
+@@ -40,8 +40,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
-@@ -54,7 +53,7 @@
+@@ -53,7 +52,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 =
- DIST_SOURCES =
-@@ -295,7 +294,6 @@
+@@ -338,7 +337,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-12-27 12:03:57.407900830 +0100
-+++ afflib/configure 2009-12-27 12:10:50.147922559 +0100
-@@ -11837,10 +11837,6 @@
+--- afflib.orig/configure 2010-01-07 13:07:17.810286182 +0100
++++ afflib/configure 2010-01-07 13:12:08.778286980 +0100
+@@ -11596,10 +11596,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"
@@ -59,7 +59,7 @@ Index: afflib/configure
ac_config_files="$ac_config_files afflib.spec"
ac_config_headers="$ac_config_headers affconfig.h"
-@@ -23141,8 +23137,6 @@
+@@ -19393,8 +19389,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" ;;
@@ -70,8 +70,8 @@ Index: afflib/configure
"afflib.pc") CONFIG_FILES="$CONFIG_FILES afflib.pc" ;;
Index: afflib/configure.ac
===================================================================
---- afflib.orig/configure.ac 2009-12-27 12:03:57.411901845 +0100
-+++ afflib/configure.ac 2009-12-27 12:10:50.199903771 +0100
+--- afflib.orig/configure.ac 2010-01-07 13:07:17.810286182 +0100
++++ afflib/configure.ac 2010-01-07 13:12:08.782315652 +0100
@@ -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 f21a755..9924e3a 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-12-27 12:10:27.652936798 +0100
-+++ afflib/Makefile.am 2009-12-27 12:10:33.396945282 +0100
+--- afflib.orig/Makefile.am 2010-01-07 13:12:31.930285794 +0100
++++ afflib/Makefile.am 2010-01-07 13:12:36.274285886 +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-12-27 12:10:27.652936798 +0100
-+++ afflib/Makefile.in 2009-12-27 12:10:33.396945282 +0100
-@@ -232,7 +232,7 @@
- target_alias = @target_alias@
+--- afflib.orig/Makefile.in 2010-01-07 13:12:31.930285794 +0100
++++ afflib/Makefile.in 2010-01-07 13:12:36.274285886 +0100
+@@ -275,7 +275,7 @@
+ top_build_prefix = @top_build_prefix@
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-12-27 12:10:27.668933735 +0100
-+++ afflib/configure 2009-12-27 12:10:33.415902035 +0100
-@@ -11835,7 +11835,7 @@
+--- afflib.orig/configure 2010-01-07 13:12:31.950285074 +0100
++++ afflib/configure 2010-01-07 13:12:36.290285754 +0100
+@@ -11594,7 +11594,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"
-@@ -23131,7 +23131,6 @@
+@@ -19383,7 +19383,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-12-27 12:10:27.668933735 +0100
-+++ afflib/configure.ac 2009-12-27 12:10:33.415902035 +0100
+--- afflib.orig/configure.ac 2010-01-07 13:12:31.950285074 +0100
++++ afflib/configure.ac 2010-01-07 13:12:36.290285754 +0100
@@ -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 b2bdd09..426e5cf 100644
--- a/debian/patches/03-bashism.patch
+++ b/debian/patches/03-bashism.patch
@@ -1,7 +1,7 @@
Index: afflib/tools/test_make_random_iso.sh
===================================================================
---- afflib.orig/tools/test_make_random_iso.sh 2009-12-27 12:30:17.884935976 +0100
-+++ afflib/tools/test_make_random_iso.sh 2010-01-02 17:12:25.344314475 +0100
+--- 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-07 13:12:46.038285475 +0100
@@ -5,7 +5,7 @@
unset AFFLIB_PASSPHRASE
--
debian-forensics/afflib
More information about the forensics-changes
mailing list