[Forensics-changes] [SCM] debian-forensics/sleuthkit branch, debian, updated. debian/3.1.3-1-20-g80ab685

[Julien Valroff]

The following commit has been merged in the debian branch:
commit d6c04885232dccee3dd13fcc01ff2104337bc785
Author: Julien Valroff <julien at kirya.net>
Date:   Wed Jun 1 21:14:04 2011 +0200

     Add patch to fix formatting error in the manpages

diff --git a/debian/changelog b/debian/changelog
index ed8bf6c..6f8fd47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-sleuthkit (3.2.1-1~1.gbpc1daa5) UNRELEASED; urgency=low
+sleuthkit (3.2.1-1~1.gbpc1daa5) unstable; urgency=low
 
   ** SNAPSHOT build @c1daa5669da8acdcb4406a7f929f36d2a1536a56 **
 
@@ -18,8 +18,9 @@ sleuthkit (3.2.1-1~1.gbpc1daa5) UNRELEASED; urgency=low
   * Bump debhelper compat to 8 
   * Update copyright information 
   * Fix dh --with syntax 
+  * Add patch to fix formatting error in the manpages 
 
- -- Julien Valroff <julien at debian.org>  Wed, 01 Jun 2011 20:37:34 +0200
+ -- Julien Valroff <julien at debian.org>  Wed, 01 Jun 2011 21:13:58 +0200
 
 sleuthkit (3.1.3-1) unstable; urgency=low
 
diff --git a/debian/patches/90_fix_ldflags.patch b/debian/patches/90_fix_ldflags.patch
deleted file mode 100644
index 70a0186..0000000
--- a/debian/patches/90_fix_ldflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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.
---- a/configure.ac
-+++ b/configure.ac
-@@ -121,7 +121,10 @@
-     )]
-     # Check for the header file first to make sure they have the dev install
-     [AC_CHECK_HEADERS([libewf.h], 
--      [AC_CHECK_LIB([ewf], [libewf_open])]
-+      [AC_CHECK_LIB([ewf], [libewf_open],[
-+        AC_SUBST([LIBEWF_LIBS],["-lewf"])
-+        AC_DEFINE([HAVE_LIBEWF],[1],[Define to have libewf header included.])
-+      ])]
-     )]
- )
- 
---- a/tsk3/Makefile.am
-+++ b/tsk3/Makefile.am
-@@ -6,7 +6,7 @@
- libtsk3_la_SOURCES =
- libtsk3_la_LIBADD = base/libtskbase.la img/libtskimg.la \
-     vs/libtskvs.la fs/libtskfs.la hashdb/libtskhashdb.la \
--    auto/libtskauto.la
-+    auto/libtskauto.la @LIBEWF_LIBS@
- # current:revision:age
- libtsk3_la_LDFLAGS = -version-info 6:1:3
- 
diff --git a/debian/patches/99_no_static_ldflags.patch b/debian/patches/99_no_static_ldflags.patch
deleted file mode 100644
index dec2113..0000000
--- a/debian/patches/99_no_static_ldflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Author: Cristian Greco <cristian at regolo.cc>
-Description: Drop `-static` from LDFLAGS from tools/*/Makefile.am in order to
-avoid sleuthkit tools to be statically linked against libtsk.
-
---- a/tools/fstools/Makefile.am
-+++ b/tools/fstools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro fscheck.cpp
- 
- bin_PROGRAMS = blkcalc blkcat blkls blkstat ffind fls fsstat icat ifind ils \
---- a/tools/hashtools/Makefile.am
-+++ b/tools/hashtools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro md5.c sha1.c
- 
- bin_PROGRAMS = hfind
---- a/tools/imgtools/Makefile.am
-+++ b/tools/imgtools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro
- 
- bin_PROGRAMS = img_cat img_stat
---- a/tools/srchtools/Makefile.am
-+++ b/tools/srchtools/Makefile.am
-@@ -6,7 +6,6 @@
- 
- sigfind_SOURCES = sigfind.cpp 
- sigfind_LDADD = ../../tsk3/libtsk3.la
--sigfind_LDFLAGS = -static
- 
- indent:
- 	indent *.c *.cpp
---- a/tools/vstools/Makefile.am
-+++ b/tools/vstools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall 
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro
- 
- bin_PROGRAMS = mmls mmstat mmcat
---- a/tools/autotools/Makefile.am
-+++ b/tools/autotools/Makefile.am
-@@ -1,6 +1,5 @@
- AM_CPPFLAGS = -I../.. -I$(srcdir)/../.. -Wall
- LDADD = ../../tsk3/libtsk3.la
--LDFLAGS += -static
- EXTRA_DIST = .indent.pro
- 
- bin_PROGRAMS = tsk_recover tsk_loaddb tsk_comparedir tsk_gettimes
diff --git a/debian/patches/series b/debian/patches/series
index 894fdfd..ff68636 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-90_fix_ldflags.patch
-99_no_static_ldflags.patch
+30_fix-manpages.diff
+90_fix_ldflags.diff
+99_no_static_ldflags.diff

-- 
debian-forensics/sleuthkit