[Forensics-changes] [SCM] debian-forensics/dc3dd branch, debian, updated. upstream/6.12.3-35-g6460433

[Julien Valroff]

The following commit has been merged in the debian branch:
commit 1b2d1ff97d5d385ad5361fbdb90798afd2d8760d
Author: Julien Valroff <julien at kirya.net>
Date:   Sun Jun 5 14:27:26 2011 +0200

    Switch to dh

diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index bcaa62e..09e4a3e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
 Priority: optional
 Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
 Uploaders: Christophe Monniez <christophe.monniez at fccu.be>
-Build-Depends: debhelper (>= 7), autotools-dev, gperf, autoconf
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, gperf, autoconf
+Standards-Version: 3.9.2
 Homepage: http://dc3dd.sourceforge.net/
 Vcs-Git: git://git.debian.org/git/debian-forensics/dc3dd.git
 Vcs-Browser: http://git.debian.org/?p=debian-forensics/dc3dd.git
diff --git a/debian/rules b/debian/rules
index e902f82..e43a244 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,59 +9,10 @@ else
 	CROSS=
 endif
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	rm -f config.sub config.guess
+export LDFLAGS+=-Wl,-z,defs
 
-	[ ! -f Makefile ] || $(MAKE) distclean
+%:
+	dh $@ --with autotools_dev
 
-	dh_clean
-
-config.status: configure
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
-	cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
-	cp -f /usr/share/misc/config.guess config.guess
-endif
-
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-hpadco CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
-
-build: build-stamp
-build-stamp: config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/dc3dd
-
-binary: binary-arch
-
-binary-arch: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep:
-
-.PHONY: clean build binary binary-arch binary-indep install
+override_dh_auto_configure:
+	dh_auto_configure -- $(CROSS) --enable-hpadco

-- 
debian-forensics/dc3dd