[Forensics-changes] [SCM] Recover deleted files on ext3 filesystems branch, debian, updated. upstream/0.6.0-21-g0df7699

[Luca Bruno]

The following commit has been merged in the debian branch:
commit 0df76992c888e1818b8837fca6e95063fefa775b
Author: Luca Bruno <lucab at debian.org>
Date:   Fri Jul 11 11:14:59 2008 +0200

    Removing -dbg package (for now)

diff --git a/debian/control b/debian/control
index 6f68fec..03946d9 100644
--- a/debian/control
+++ b/debian/control
@@ -17,12 +17,3 @@ Description: Tool to help recover deleted files on ext3 filesystems
  file on an ext3 filesystem, only to find that they wanted it shortly
  thereafter.
 
-Package: ext3grep-dbg
-Architecture: any
-Depends: ext3grep
-Description: Tool to help recover deleted files on ext3 filesystems (debugging symbols)
- ext3grep is a simple tool intended to aid anyone who accidentally deletes a
- file on an ext3 filesystem, only to find that they wanted it shortly
- thereafter.
- .
- This package contains the debug symbols for the ext3grep binary.
diff --git a/debian/rules b/debian/rules
index f59a468..69a705c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+# Uncomment the following line to disable optimization and enable
+# richer debug information.
+# DEB_BUILD_OPTIONS += nostrip noopt
 
 DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
@@ -9,6 +12,10 @@ else
 	CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
+ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+	EXTRA += --enable-debug --disable-optimization
+endif
+
 clean:
 	dh_testdir
 	dh_testroot
@@ -28,7 +35,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --enable-debug --disable-optimization
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr $(EXTRA)
 
 build: build-stamp
 build-stamp: config.status
@@ -54,7 +61,7 @@ binary-arch: build install
 	dh_installchangelogs NEWS
 	dh_installdocs
 	dh_installman
-	dh_strip --dbg-package=ext3grep-dbg
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb

-- 
Recover deleted files on ext3 filesystems