[Forensics-changes] [SCM] Tools for forensics analysis branch, debian, updated. debian/3.0.1-2-8-gc6947bd

Cristian Greco cristian.debian at gmail.com
Wed Jul 29 16:14:35 UTC 2009 

The following commit has been merged in the debian branch:
commit a0452c16f5645e90cab52fe33f5b7b2566833203
Author: Cristian Greco <cristian.debian at gmail.com>
Date:   Wed Jul 29 03:46:13 2009 +0200

    debian/{control,rules}: build-depend on debhelper (>= 7.3.0) and quilt (>= 0.46-7) and rewrite debian/rules in a simple form.
    
    Signed-off-by: Cristian Greco <cristian.debian at gmail.com>

diff --git a/debian/control b/debian/control
index e8fa82d..6787acc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: sleuthkit
 Section: admin
 Priority: optional
 Maintainer: Cristian Greco <cristian.debian at gmail.com>
-Build-Depends: debhelper (>= 5), quilt (>= 0.40), autotools-dev, libz-dev, libssl-dev
+Build-Depends: debhelper (>= 7.3.0), quilt (>= 0.46-7), autotools-dev, libz-dev, libssl-dev
 Standards-Version: 3.8.2
 Homepage: http://www.sleuthkit.org/sleuthkit/
 
 Package: sleuthkit
 Architecture: any
-Depends: ${shlibs:Depends}, file, libdate-manip-perl
+Depends: ${shlibs:Depends}, ${misc:Depends}, file, libdate-manip-perl
 Description: Tools for forensics analysis
  The Sleuth Kit (previously known as TASK) is a collection of UNIX-based
  command line file system and media management forensic analysis tools.
@@ -34,7 +34,7 @@ Description: Tools for forensics analysis
 Package: libtsk3-3
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Library for forensics analysis
  The Sleuth Kit (previously known as TASK) is a collection of UNIX-based
  command line file system and media management forensic analysis tools;
@@ -45,7 +45,7 @@ Package: libtsk3-3-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: libtsk3-3 (= ${binary:Version}), ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libtsk3-3 (= ${binary:Version})
 Suggests: libc-dbg
 Description: Library for forensics analysis with debug symbols
  The Sleuth Kit (previously known as TASK) is a collection of UNIX-based
@@ -58,7 +58,7 @@ Package: libtsk-dev
 Architecture: any
 Section: libdevel
 Priority: extra
-Depends: libtsk3-3 (= ${binary:Version}), libc6-dev | libc-dev, zlib1g-dev | libz-dev, libssl-dev
+Depends: ${misc:Depends}, libtsk3-3 (= ${binary:Version}), libc6-dev | libc-dev, zlib1g-dev | libz-dev, libssl-dev
 Suggests: libtsk3-3-dbg
 Description: Development files for forensics analysis
  The Sleuth Kit (previously known as TASK) is a collection of UNIX-based
diff --git a/debian/rules b/debian/rules
index 24807eb..0b0c102 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,122 +1,41 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-include /usr/share/quilt/quilt.make
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-
-#CFLAGS = -Wall -g -D_REENTRANT
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    CFLAGS += -O0
-else
-    CFLAGS += -O2
-endif
-
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp build-arch-stamp build-indep-stamp 
-	[ ! -f Makefile ] || $(MAKE) distclean
+%:
+	dh --with quilt $@
 
+override_dh_auto_clean:
 	# restore backup config.{sub,guess}
 	if [ -f config/config.sub.backup ]; then \
 		mv -fv config/config.sub.backup config/config.sub; \
 	fi
-
 	if [ -f config/config.guess.backup ]; then \
 		mv -fv config/config.guess.backup config/config.guess; \
 	fi
+	dh_auto_clean
 
-
-config.status: configure $(QUILT_STAMPFN)
-	dh_testdir
-
+override_dh_auto_configure:
 	# overwrite config.{sub,guess} from autotools-dev
 	if [ -r /usr/share/misc/config.sub ] && [ ! -f config/config.sub.backup ]; then \
 		mv -v config/config.sub config/config.sub.backup; \
 		cp -f /usr/share/misc/config.sub config/config.sub; \
 	fi
-
 	if [ -r /usr/share/misc/config.guess ] && [ ! -f config/config.guess.backup ]; then \
 		mv -v config/config.guess config/config.guess.backup; \
 		cp -f /usr/share/misc/config.guess config/config.guess; \
 	fi
-
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-
-build: build-stamp
-
-build-stamp: config.status
-	$(MAKE) 
-	touch $@
-
-
-install: build-stamp
-	dh_testdir
-	dh_testroot
-	dh_clean -k -s
-	dh_installdirs -s
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-	dh_install -s --sourcedir=debian/tmp --list-missing
-	cp -p debian/srch_strings.1 debian/sleuthkit/usr/share/man/man1
-
-#	# see bug #283709
-#	mv  debian/sleuthkit/usr/bin/dstat \
-#		debian/sleuthkit/usr/bin/datastat
-#	# see bug #283709
-#	mv  debian/sleuthkit/usr/share/man/man1/dstat.1 \
-#		debian/sleuthkit/usr/share/man/man1/datastat.1
-	mv  debian/sleuthkit/usr/bin/icat \
-		debian/sleuthkit/usr/bin/icat-sleuthkit
-	mv  debian/sleuthkit/usr/bin/ils \
-		debian/sleuthkit/usr/bin/ils-sleuthkit
-	mv  debian/sleuthkit/usr/bin/mactime \
-		debian/sleuthkit/usr/bin/mactime-sleuthkit
-	mv  debian/sleuthkit/usr/share/man/man1/icat.1 \
-		debian/sleuthkit/usr/share/man/man1/icat-sleuthkit.1
-	mv  debian/sleuthkit/usr/share/man/man1/ils.1 \
-		debian/sleuthkit/usr/share/man/man1/ils-sleuthkit.1
-	mv  debian/sleuthkit/usr/share/man/man1/mactime.1 \
-		debian/sleuthkit/usr/share/man/man1/mactime-sleuthkit.1
-
-binary: binary-arch
-
-binary-arch: build-stamp install
-	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-binary-indep:
-	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-binary-common:
-	dh_testdir
-	dh_testroot
+	dh_auto_configure -- LDFLAGS="-Wl,-z,defs"
+
+override_dh_auto_install:
+	dh_auto_install
+	mv debian/tmp/usr/bin/icat    debian/tmp/usr/bin/icat-sleuthkit
+	mv debian/tmp/usr/bin/ils     debian/tmp/usr/bin/ils-sleuthkit
+	mv debian/tmp/usr/bin/mactime debian/tmp/usr/bin/mactime-sleuthkit
+	mv debian/tmp/usr/share/man/man1/icat.1    debian/tmp/usr/share/man/man1/icat-sleuthkit.1
+	mv debian/tmp/usr/share/man/man1/ils.1     debian/tmp/usr/share/man/man1/ils-sleuthkit.1
+	mv debian/tmp/usr/share/man/man1/mactime.1 debian/tmp/usr/share/man/man1/mactime-sleuthkit.1
+
+override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt
-	dh_installdocs
-	dh_installman
-	dh_link
-	dh_strip -Nlibtsk3-3
-	dh_strip -plibtsk3-3 --dbg-package=libtsk3-3-dbg
-	dh_compress 
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
 
-.PHONY: clean build binary binary-arch binary-indep binary-common install
+override_dh_strip:
+	dh_strip -a -plibtsk3-3 --dbg-package=libtsk3-3-dbg
diff --git a/debian/sleuthkit.install b/debian/sleuthkit.install
index f7177e8..0a09cd9 100644
--- a/debian/sleuthkit.install
+++ b/debian/sleuthkit.install
@@ -1,2 +1,3 @@
 usr/bin
 usr/share
+debian/srch_strings.1 usr/share/man/man1

-- 
Tools for forensics analysis

More information about the forensics-changes mailing list