[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.3.6+dfsg-3-3-g1c83eb6
Christophe Monniez
christophe.monniez at fccu.be
Mon Oct 5 16:01:43 UTC 2009
The following commit has been merged in the debian branch:
commit 1c83eb6e2378338d58efc0fc82973757ee034a7a
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date: Mon Oct 5 18:04:46 2009 +0200
Updating quilt patches.
diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index f1169a3..2a5a5c7 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -1,10 +1,11 @@
Author: Daniel Baumann <daniel at debian.org>
Description: Rebuilding upstream tarball without debian directory.
-diff -Naurp afflib.orig/Makefile.am afflib/Makefile.am
---- afflib.orig/Makefile.am 2009-05-12 00:15:24.000000000 +0000
-+++ afflib/Makefile.am 2009-07-28 10:58:42.000000000 +0000
-@@ -96,7 +96,6 @@ DOCS = BUGLIST.txt README_Linux.txt READ
+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
+@@ -100,7 +100,6 @@
doc/announce_2.2.txt
EXTRA_DIST = $(DOCS) \
@@ -12,10 +13,11 @@ diff -Naurp afflib.orig/Makefile.am afflib/Makefile.am
acx_pthread.m4 \
afflib.spec.in \
afflib.spec \
-diff -Naurp afflib.orig/Makefile.in afflib/Makefile.in
---- afflib.orig/Makefile.in 2009-05-19 19:22:30.000000000 +0000
-+++ afflib/Makefile.in 2009-07-28 10:58:33.000000000 +0000
-@@ -38,8 +38,7 @@ DIST_COMMON = README $(am__configure_dep
+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 @@
$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/affconfig.h.in \
$(srcdir)/afflib.pc.in $(srcdir)/afflib.spec.in \
@@ -25,16 +27,16 @@ diff -Naurp afflib.orig/Makefile.in afflib/Makefile.in
ChangeLog INSTALL NEWS compile config.guess config.sub depcomp \
install-sh ltmain.sh missing
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,7 +50,7 @@ am__CONFIG_DISTCLEAN_FILES = config.stat
+@@ -56,7 +55,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 =
-@@ -293,7 +292,6 @@ DOCS = BUGLIST.txt README_Linux.txt READ
+@@ -340,7 +339,6 @@
doc/announce_2.2.txt
EXTRA_DIST = $(DOCS) \
@@ -42,10 +44,11 @@ diff -Naurp afflib.orig/Makefile.in afflib/Makefile.in
acx_pthread.m4 \
afflib.spec.in \
afflib.spec \
-diff -Naurp afflib.orig/configure afflib/configure
---- afflib.orig/configure 2009-05-19 19:22:28.000000000 +0000
-+++ afflib/configure 2009-07-28 10:58:00.000000000 +0000
-@@ -11770,10 +11770,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+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 @@
# 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"
@@ -56,7 +59,7 @@ diff -Naurp afflib.orig/configure afflib/configure
ac_config_files="$ac_config_files afflib.spec"
ac_config_headers="$ac_config_headers affconfig.h"
-@@ -23969,8 +23965,6 @@ do
+@@ -19245,8 +19241,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" ;;
@@ -65,10 +68,11 @@ diff -Naurp afflib.orig/configure afflib/configure
"afflib.spec") CONFIG_FILES="$CONFIG_FILES afflib.spec" ;;
"affconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS affconfig.h" ;;
"afflib.pc") CONFIG_FILES="$CONFIG_FILES afflib.pc" ;;
-diff -Naurp afflib.orig/configure.ac afflib/configure.ac
---- afflib.orig/configure.ac 2009-05-19 19:08:19.000000000 +0000
-+++ afflib/configure.ac 2009-07-28 10:58:03.000000000 +0000
-@@ -34,8 +34,6 @@ ACX_PTHREAD()
+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
+@@ -34,8 +34,6 @@
AC_CONFIG_FILES([Makefile lib/Makefile tools/Makefile lzma443/Makefile win32/Makefile
tests/Makefile doc/Makefile pyaff/Makefile man/Makefile])
dnl Have configure make distribution specific files
diff --git a/debian/patches/02-win32-files.patch b/debian/patches/02-win32-files.patch
index 44ac112..fbce3cd 100644
--- a/debian/patches/02-win32-files.patch
+++ b/debian/patches/02-win32-files.patch
@@ -1,19 +1,21 @@
Author: Daniel Baumann <daniel at debian.org>
Description: Rebuilding upstream tarball without win32 files.
-diff -Naurp afflib.orig/Makefile.am afflib/Makefile.am
---- afflib.orig/Makefile.am 2009-07-28 11:26:20.000000000 +0000
-+++ afflib/Makefile.am 2009-07-28 11:27:14.000000000 +0000
+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
@@ -1,4 +1,4 @@
-SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
+SUBDIRS = lib tools lzma443 tests doc pyaff man
pkgconfigdir = $(libdir)/pkgconfig
-diff -Naurp afflib.orig/Makefile.in afflib/Makefile.in
---- afflib.orig/Makefile.in 2009-07-28 11:26:20.000000000 +0000
-+++ afflib/Makefile.in 2009-07-28 11:27:17.000000000 +0000
-@@ -230,7 +230,7 @@ target_alias = @target_alias@
+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@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@@ -22,10 +24,11 @@ diff -Naurp afflib.orig/Makefile.in afflib/Makefile.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = afflib.pc
include_HEADERS =
-diff -Naurp afflib.orig/configure afflib/configure
---- afflib.orig/configure 2009-07-28 11:26:20.000000000 +0000
-+++ afflib/configure 2009-07-28 11:26:44.000000000 +0000
-@@ -11768,7 +11768,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+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 @@
# AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
# AC_PROG_RANLIB
@@ -34,7 +37,7 @@ diff -Naurp afflib.orig/configure afflib/configure
ac_config_files="$ac_config_files afflib.spec"
-@@ -23960,7 +23960,6 @@ do
+@@ -19236,7 +19236,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" ;;
@@ -42,10 +45,11 @@ diff -Naurp afflib.orig/configure afflib/configure
"tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
"doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
"pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
-diff -Naurp afflib.orig/configure.ac afflib/configure.ac
---- afflib.orig/configure.ac 2009-07-28 11:26:20.000000000 +0000
-+++ afflib/configure.ac 2009-07-28 11:26:53.000000000 +0000
-@@ -31,7 +31,7 @@ ACX_PTHREAD()
+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
+@@ -31,7 +31,7 @@
# AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
# AC_PROG_RANLIB
--
debian-forensics/afflib
More information about the forensics-changes
mailing list