7 files changed, 19 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 9cc5ddd31..bc5713c10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openssh (1:5.1p1-7) UNRELEASED; urgency=low
     #539030).
   * Add ${misc:Depends} to keep Lintian happy.
   * Use 'which' rather than 'type' in maintainer scripts.
+  * Upgrade to debhelper v7.
 
  -- Colin Watson <cjwatson@debian.org>  Fri, 24 Jul 2009 18:43:45 +0100
 
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000000000..2a412a1ce
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+config.log
+debian/ssh-askpass-gnome.png
diff --git a/debian/compat b/debian/compat
index b8626c4cf..7f8f011eb 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 8252fc2c8..cce36c127 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Debian OpenSSH Maintainers <debian-ssh@lists.debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8-1), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 5.0.22), sharutils, libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev | heimdal-dev
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8-1), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 7.0.1), sharutils, libselinux1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev | heimdal-dev
 Standards-Version: 3.7.3
 Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
 
diff --git a/debian/openssh-client.docs b/debian/openssh-client.docs
new file mode 100644
index 000000000..00fd691c4
--- /dev/null
+++ b/debian/openssh-client.docs
@@ -0,0 +1,7 @@
+ChangeLog.gssapi
+OVERVIEW
+README
+README.dns
+README.tun
+debian/faq.html
+debian/README.compromised-keys
diff --git a/debian/rules b/debian/rules
index 371084e3a..1a0388a5d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -149,12 +149,9 @@ build-udeb-stamp:
 
 clean:
         dh_testdir
-        rm -f build-deb-stamp build-udeb-stamp
         rm -rf build-deb build-udeb
         $(MAKE) -C debian/tests clean
         $(MAKE) -C contrib clean
-        rm -f config.log
-        rm -f debian/ssh-askpass-gnome.png
         (cat debian/copyright.head; iconv -f ISO-8859-1 -t UTF-8 LICENCE) \
                 > debian/copyright
         dh_clean
@@ -163,7 +160,7 @@ install: DH_OPTIONS=-a
 install: build
         dh_testdir
         dh_testroot
-        dh_clean -k
+        dh_prep
         dh_installdirs
 
         $(MAKE) -C build-deb DESTDIR=`pwd`/debian/openssh-client install-nokeys
@@ -221,8 +218,8 @@ binary-openssh-client: build install
         dh_testdir
         dh_testroot
         dh_installdebconf
-        dh_installdocs OVERVIEW README README.dns README.tun debian/faq.html debian/README.compromised-keys
-        dh_installchangelogs ChangeLog ChangeLog.gssapi
+        dh_installdocs
+        dh_installchangelogs
         install -m644 debian/openssh-client.lintian debian/openssh-client/usr/share/lintian/overrides/openssh-client
         dh_strip
         dh_compress
@@ -287,7 +284,7 @@ binary-ssh-krb5: build install
         dh_testdir
         dh_testroot
         dh_installdocs
-        dh_installchangelogs ChangeLog ChangeLog.gssapi
+        dh_installchangelogs
         dh_link
         dh_compress
         dh_fixperms
@@ -301,8 +298,8 @@ binary-ssh-askpass-gnome: build install
         dh_testdir
         dh_testroot
         dh_installdocs
-        dh_installexamples debian/ssh-askpass-gnome.desktop
-        dh_installchangelogs ChangeLog ChangeLog.gssapi
+        dh_installexamples
+        dh_installchangelogs
         dh_strip
         dh_compress
         dh_fixperms
diff --git a/debian/ssh-askpass-gnome.examples b/debian/ssh-askpass-gnome.examples
new file mode 100644
index 000000000..66fd8c0e4
--- /dev/null
+++ b/debian/ssh-askpass-gnome.examples
@@ -0,0 +1 @@
+debian/ssh-askpass-gnome.desktop