[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.5+dfsg-1-5-gb50f1bc

Christophe Monniez christophe.monniez at fccu.be
Sun Jan 17 17:21:49 UTC 2010 

The following commit has been merged in the debian branch:
commit b50f1bc3a157309ca1f0ab16a8ed7fecf268ea69
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Sun Jan 17 18:21:44 2010 +0100

    Refreshing quilt patches.

diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index 667f75b..1320b49 100644
--- a/debian/patches/01-debian-directory.patch
+++ b/debian/patches/01-debian-directory.patch
@@ -4,7 +4,7 @@ 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-07 13:12:08.774316137 +0100
++++ afflib/Makefile.am	2010-01-17 18:19:46.583184830 +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	2010-01-07 13:07:17.778286376 +0100
-+++ afflib/Makefile.in	2010-01-07 13:12:08.774316137 +0100
-@@ -40,8 +40,7 @@
+--- 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 \
@@ -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
-@@ -53,7 +52,7 @@
+@@ -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
- CONFIG_CLEAN_VPATH_FILES =
  SOURCES =
-@@ -338,7 +337,6 @@
+ DIST_SOURCES =
+@@ -292,7 +291,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	2010-01-07 13:07:17.810286182 +0100
-+++ afflib/configure	2010-01-07 13:12:08.778286980 +0100
-@@ -11596,10 +11596,6 @@
+--- 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"
  
@@ -59,7 +59,7 @@ Index: afflib/configure
  ac_config_files="$ac_config_files afflib.spec"
  
  ac_config_headers="$ac_config_headers affconfig.h"
-@@ -19393,8 +19389,6 @@
+@@ -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" ;;
@@ -70,8 +70,8 @@ Index: afflib/configure
      "afflib.pc") CONFIG_FILES="$CONFIG_FILES afflib.pc" ;;
 Index: afflib/configure.ac
 ===================================================================
---- afflib.orig/configure.ac	2010-01-07 13:07:17.810286182 +0100
-+++ afflib/configure.ac	2010-01-07 13:12:08.782315652 +0100
+--- afflib.orig/configure.ac	2010-01-17 18:16:24.266171784 +0100
++++ afflib/configure.ac	2010-01-17 18:19:46.603171953 +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 9924e3a..c05b1a2 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	2010-01-07 13:12:31.930285794 +0100
-+++ afflib/Makefile.am	2010-01-07 13:12:36.274285886 +0100
+--- afflib.orig/Makefile.am	2010-01-17 18:19:46.583184830 +0100
++++ afflib/Makefile.am	2010-01-17 18:20:03.139174718 +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	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@
+--- 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
@@ -26,9 +26,9 @@ Index: afflib/Makefile.in
  include_HEADERS = 
 Index: afflib/configure
 ===================================================================
---- 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 @@
+--- 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
@@ -37,7 +37,7 @@ Index: afflib/configure
  
  ac_config_files="$ac_config_files afflib.spec"
  
-@@ -19383,7 +19383,6 @@
+@@ -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" ;;
@@ -47,8 +47,8 @@ Index: afflib/configure
      "pyaff/Makefile") CONFIG_FILES="$CONFIG_FILES pyaff/Makefile" ;;
 Index: afflib/configure.ac
 ===================================================================
---- afflib.orig/configure.ac	2010-01-07 13:12:31.950285074 +0100
-+++ afflib/configure.ac	2010-01-07 13:12:36.290285754 +0100
+--- afflib.orig/configure.ac	2010-01-17 18:19:46.603171953 +0100
++++ afflib/configure.ac	2010-01-17 18:20:03.159181325 +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 426e5cf..0ad7a24 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-14 03:59:00.000000000 +0100
-+++ afflib/tools/test_make_random_iso.sh	2010-01-07 13:12:46.038285475 +0100
++++ afflib/tools/test_make_random_iso.sh	2010-01-17 18:20:18.195173325 +0100
 @@ -5,7 +5,7 @@
  
  unset AFFLIB_PASSPHRASE

-- 
debian-forensics/afflib

More information about the forensics-changes mailing list