[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.2.1-2-11-g74a6cce

[Christophe Monniez]

The following commit has been merged in the debian branch:
commit 74a6cceb5b235e374997ca8765f29ff852200b2a
Author: Christophe Monniez <christophe.monniez at fccu.be>
Date:   Tue Oct 11 12:06:27 2011 +0200

    Refreshing quilt patches.

diff --git a/debian/patches/30_fix-manpages.diff b/debian/patches/30_fix-manpages.diff
index bf41fd4..dc1bd03 100644
--- a/debian/patches/30_fix-manpages.diff
+++ b/debian/patches/30_fix-manpages.diff
@@ -50,7 +50,7 @@ Last-Update: 2011-06-01
  To load image data from image.dd to image.dd.db:
 --- a/man/tsk_recover.1
 +++ b/man/tsk_recover.1
-@@ -28,7 +28,7 @@
+@@ -30,7 +30,7 @@
  .IP -e
  Recover all files (allocated and unallocated)
  .IP "-i imgtype"
diff --git a/debian/patches/90_fix_ldflags.diff b/debian/patches/90_fix_ldflags.diff
index 0715f7b..6d37b19 100644
--- a/debian/patches/90_fix_ldflags.diff
+++ b/debian/patches/90_fix_ldflags.diff
@@ -1,10 +1,8 @@
 Author: Cristian Greco <cristian.debian at gmail.com>
 Description: Avoid linking against unused libraries (this holds both for
 library and tools) by enabling extra LDFLAGS at build time.
-Index: sleuthkit-3.2.2/configure.ac
-===================================================================
---- sleuthkit-3.2.2.orig/configure.ac	2011-08-11 09:04:37.000000000 -0400
-+++ sleuthkit-3.2.2/configure.ac	2011-08-11 09:04:44.000000000 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -121,7 +121,10 @@
      )]
      # Check for the header file first to make sure they have the dev install
@@ -17,10 +15,8 @@ Index: sleuthkit-3.2.2/configure.ac
      )]
  )
  
-Index: sleuthkit-3.2.2/tsk3/Makefile.am
-===================================================================
---- sleuthkit-3.2.2.orig/tsk3/Makefile.am	2011-08-11 09:04:37.000000000 -0400
-+++ sleuthkit-3.2.2/tsk3/Makefile.am	2011-08-11 09:04:44.000000000 -0400
+--- a/tsk3/Makefile.am
++++ b/tsk3/Makefile.am
 @@ -6,7 +6,7 @@
  libtsk3_la_SOURCES =
  libtsk3_la_LIBADD = base/libtskbase.la img/libtskimg.la \
@@ -28,5 +24,5 @@ Index: sleuthkit-3.2.2/tsk3/Makefile.am
 -    auto/libtskauto.la
 +    auto/libtskauto.la @LIBEWF_LIBS@
  # current:revision:age
- libtsk3_la_LDFLAGS = -version-info 6:2:3
+ libtsk3_la_LDFLAGS = -version-info 7:0:4
  

-- 
debian-forensics/sleuthkit