Switch to debhelper 7

7 files changed, 13 insertions, 63 deletions

diff --git a/debian/changelog b/debian/changelog
index 14f04f4..42a76d0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
 scons (1.2.0-3) UNRELEASED; urgency=low
 
-  * Switch to python-support:
+  * Switch to debhelper 7.
+  * Switch to python-support.
   * Do not build-depend on unnecessary python-dev, replace it with python.
   * Bump Standards-Version to 3.8.2, no changes required.
 
- -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 01 Aug 2009 19:55:13 +0200
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sat, 01 Aug 2009 20:31:13 +0200
 
 scons (1.2.0-2) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 0ebe487..4e1f0ad 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: devel
 Priority: optional
 Maintainer: Luca Falavigna <dktrkranz@ubuntu.com>
 Uploaders: Mark Brown <broonie@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python (>= 2.5.4-1~), quilt
+Build-Depends: debhelper (>= 7.2.18), python (>= 2.5.4-1~), quilt (>= 0.46-7)
 Build-Depends-Indep: python-support (>= 0.5.3)
 Standards-Version: 3.8.2
 XS-Python-Version: >= 2.4
@@ -12,7 +12,7 @@ DM-Upload-Allowed: yes
 
 Package: scons
 Architecture: all
-Depends: ${python:Depends}
+Depends: ${python:Depends}, ${misc:Depends}
 Description: replacement for make
  SCons is a make replacement providing a range of enhanced features such
  as automated dependency generation and built in compilation cache
diff --git a/debian/scons.docs b/debian/docs
index 71dfd5b..71dfd5b 100644
--- a/debian/scons.docs
+++ b/debian/docs
diff --git a/debian/scons.manpages b/debian/manpages
index ce14d14..ce14d14 100644
--- a/debian/scons.manpages
+++ b/debian/manpages
diff --git a/debian/rules b/debian/rules
index a20c7b6..919f8c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,60 +1,12 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh --with quilt $@
 
-include /usr/share/quilt/quilt.make
+clean:
+	rm -fr build
+	dh --with quilt $@
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
+override_dh_auto_install:
+	dh_auto_install -- --no-version-script --standalone-lib --no-install-man
 
-build: patch configure-stamp build-stamp
-build-stamp:
-	dh_testdir
-	python setup.py build
-	touch build-stamp
-
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	python setup.py clean
-	rm -f build-stamp configure-stamp
-	rm -rf build/
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	python setup.py install --root=`pwd`/debian/scons --no-compile --no-install-man --no-version-script --standalone-lib
-	rm -rf debian/scons/usr/man
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_pysupport
-	dh_installman
-	dh_installchangelogs CHANGES.txt
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/scons.dirs b/debian/scons.dirs
deleted file mode 100644
index 93a451b..0000000
--- a/debian/scons.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/share/doc/scons
-usr/share/man/man1