Upgrade to debhelper v7. (Override rules get pretty hairy for this

package, so I haven't switched to dh(1).)

r60091

5 files changed, 10 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 17a9ec2..0d3b7f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ debootstrap (1.0.16) UNRELEASED; urgency=low
 
   * Cope with pre-dependencies of included packages that aren't in Priority:
     required (closes: #487908).
+  * Upgrade to debhelper v7. (Override rules get pretty hairy for this
+    package, so I haven't switched to dh(1).)
 
  -- Colin Watson <cjwatson@debian.org>  Wed, 29 Jul 2009 10:46:56 +0100
 
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 3f42749..577b759 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
 Priority: extra
 Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
 Uploaders: Anthony Towns <ajt@debian.org>, Joey Hess <joeyh@debian.org>, Frans Pop <fjp@debian.org>, Junichi Uekawa <dancer@debian.org>, Colin Watson <cjwatson@debian.org>
-Build-Depends: debhelper (>= 4.2), makedev (>= 2.3.1-69)
+Build-Depends: debhelper (>= 7.0.0), makedev (>= 2.3.1-69)
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/d-i/trunk/packages/debootstrap
 
diff --git a/debian/debootstrap.manpages b/debian/debootstrap.manpages
new file mode 100644
index 0000000..d6a5e4a
--- /dev/null
+++ b/debian/debootstrap.manpages
@@ -0,0 +1 @@
+debootstrap.8
diff --git a/debian/rules b/debian/rules
index d09c015..f48d5a6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,4 @@
-#!/usr/bin/make -f
+#! /usr/bin/make -f
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -8,9 +8,7 @@ configure:
 
 clean:
 	dh_testdir
-
-	$(MAKE) clean
-
+	dh_auto_clean
 	dh_clean
 
 build: configure
@@ -19,14 +17,12 @@ build: configure
 real-build: build
 	dh_testdir
 	dh_testroot
-
-	$(MAKE) all
+	dh_auto_build
 
 install: real-build
 	dh_testdir
 	dh_testroot
-
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 #	 install the package into debian/debootstrap
@@ -58,7 +54,7 @@ binary-indep: install
 	dh_testdir
 	dh_testroot
 	dh_installdocs -i
-	dh_installman -i debootstrap.8
+	dh_installman -i
 	dh_installchangelogs -i
 	dh_link -i
 	-rm -rf debian/debootstrap-udeb/usr/share/debootstrap/scripts/potato \