From 66b2a2a22698c9f4aa140e442711918cd1fe5207 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sun, 23 May 2010 18:56:57 -0400
Subject: [PATCH] debhelper updates

* Use debhelper compat level v7 when building packages. All changes
  since v4 seem safe for alien's generated rules files.
* Use dh_prep instead of deprecated dh_clean -k.
---
 Alien/Package/Deb.pm | 13 ++++++-------
 debian/changelog     |  8 ++++++++
 debian/control       |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm
index 04cd093..e8d85bc 100644
--- a/Alien/Package/Deb.pm
+++ b/Alien/Package/Deb.pm
@@ -383,6 +383,11 @@ sub prep {
 		close OUT;
 	}
 
+	# Use debhelper v7
+	open (OUT, ">$dir/debian/compat") || die "$dir/debian/compat: $!";
+	print OUT "7\n";
+	close OUT;
+
 	# A minimal rules file.
 	open (OUT, ">$dir/debian/rules") || die "$dir/debian/rules: $!";
 	my $fixpermscomment = $this->fixperms ? "" : "#";
@@ -390,12 +395,6 @@ sub prep {
 #!/usr/bin/make -f
 # debian/rules for alien
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# Use v4 compatability mode, so ldconfig gets added to maint scripts.
-export DH_COMPAT=4
-
 PACKAGE=\$(shell dh_listpackages)
 
 build:
@@ -411,7 +410,7 @@ binary-indep: build
 binary-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k -d
+	dh_prep
 	dh_installdirs
 
 	dh_installdocs
diff --git a/debian/changelog b/debian/changelog
index 65b3411..a2e5d8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+alien (8.82) UNRELEASED; urgency=low
+
+  * Use debhelper compat level v7 when building packages. All changes
+    since v4 seem safe for alien's generated rules files.
+  * Use dh_prep instead of deprecated dh_clean -k.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 23 May 2010 18:55:14 -0400
+
 alien (8.81) unstable; urgency=low
 
   * Avoid uninitialized value warning when debian/rules fails to run
diff --git a/debian/control b/debian/control
index 4eb5baf..d17cbb7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Homepage: http://kitenet.net/~joey/code/alien/
 Package: alien
 Architecture: all
 Section: admin
-Depends: debhelper (>= 3), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
+Depends: debhelper (>= 7), ${misc:Depends}, ${perl:Depends}, rpm (>= 2.4.4-2), dpkg-dev, make, cpio, rpm2cpio
 Suggests: patch, bzip2, lsb-rpm, lintian, lzma
 Description: convert and install rpm and other packages
  Alien allows you to convert LSB, Red Hat, Stampede and Slackware Packages