[Forensics-changes] [SCM] debian-forensics/afflib branch, debian, updated. debian/3.5.4+dfsg-1-2-gf2782ad

Christophe Monniez christophe.monniez at fccu.be
Sun Dec 27 11:13:52 UTC 2009


The following commit has been merged in the debian branch:
commit f2782ada0c1349a4961b6010863c063687040c41
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Sun Dec 27 12:11:44 2009 +0100

    Refreshing quilt patches.

diff --git a/debian/patches/01-debian-directory.patch b/debian/patches/01-debian-directory.patch
index c1aa2cb..b92e274 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-17 09:30:30.393140252 +0100
-+++ afflib/Makefile.am	2009-12-17 09:32:04.785175510 +0100
+--- afflib.orig/Makefile.am	2009-12-27 12:03:57.391901658 +0100
++++ afflib/Makefile.am	2009-12-27 12:10:50.039902269 +0100
 @@ -100,7 +100,6 @@
  	doc/announce_2.2.txt
  
@@ -15,8 +15,8 @@ Index: afflib/Makefile.am
  	afflib.spec \
 Index: afflib/Makefile.in
 ===================================================================
---- afflib.orig/Makefile.in	2009-12-17 09:30:30.413142161 +0100
-+++ afflib/Makefile.in	2009-12-17 09:32:04.785175510 +0100
+--- 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 @@
  	$(pkginclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/affconfig.h.in \
@@ -46,8 +46,8 @@ Index: afflib/Makefile.in
  	afflib.spec \
 Index: afflib/configure
 ===================================================================
---- afflib.orig/configure	2009-12-17 09:30:30.457141555 +0100
-+++ afflib/configure	2009-12-17 09:32:18.334139477 +0100
+--- 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 @@
  # 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"
@@ -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-17 09:30:30.501190116 +0100
-+++ afflib/configure.ac	2009-12-17 09:32:04.805173475 +0100
+--- afflib.orig/configure.ac	2009-12-27 12:03:57.411901845 +0100
++++ afflib/configure.ac	2009-12-27 12:10:50.199903771 +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 c641f39..f21a755 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-17 09:33:53.000000000 +0100
-+++ afflib/Makefile.am	2009-12-17 09:35:31.202141233 +0100
+--- afflib.orig/Makefile.am	2009-12-27 12:10:27.652936798 +0100
++++ afflib/Makefile.am	2009-12-27 12:10:33.396945282 +0100
 @@ -1,4 +1,4 @@
 -SUBDIRS = lib tools lzma443 win32 tests doc pyaff man
 +SUBDIRS = lib tools lzma443 tests doc pyaff man
@@ -13,8 +13,8 @@ Index: afflib/Makefile.am
  
 Index: afflib/Makefile.in
 ===================================================================
---- afflib.orig/Makefile.in	2009-12-17 09:33:53.000000000 +0100
-+++ afflib/Makefile.in	2009-12-17 09:35:31.206140994 +0100
+--- 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@
  top_builddir = @top_builddir@
@@ -26,8 +26,8 @@ Index: afflib/Makefile.in
  include_HEADERS = 
 Index: afflib/configure
 ===================================================================
---- afflib.orig/configure	2009-12-17 09:33:53.000000000 +0100
-+++ afflib/configure	2009-12-17 09:36:49.638175236 +0100
+--- 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 @@
  
  # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL
@@ -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-17 09:33:53.000000000 +0100
-+++ afflib/configure.ac	2009-12-17 09:38:17.198143797 +0100
+--- afflib.orig/configure.ac	2009-12-27 12:10:27.668933735 +0100
++++ afflib/configure.ac	2009-12-27 12:10:33.415902035 +0100
 @@ -30,7 +30,7 @@
  
  # AC_PROG_RANLIB not needed if you are using AC_PROG_LIBTOOL

-- 
debian-forensics/afflib



More information about the forensics-changes mailing list