5 files changed, 3 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index c028ab271..52fff1b00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ openssh (1:4.1p1-4) UNRELEASED; urgency=low
     are available.
   * Restore /usr/lib/sftp-server temporarily, as a symlink to
     /usr/lib/openssh/sftp-server (closes: #312891).
+  * Switch to debhelper compat level 3, since 2 is deprecated.
   * debconf template translations:
     - Update German (thanks, Jens Seidel; closes: #313949).
 
diff --git a/debian/control b/debian/control
index bd12f1d6e..ba7447573 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Matthew Vernon <matthew@debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 2), sharutils, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc]
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc]
 Standards-Version: 3.6.1
 Uploaders: Colin Watson <cjwatson@debian.org>
 
diff --git a/debian/openssh-client.conffiles b/debian/openssh-client.conffiles
deleted file mode 100644
index 70b55c8f8..000000000
--- a/debian/openssh-client.conffiles
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/ssh/ssh_config
-/etc/ssh/moduli
diff --git a/debian/openssh-server.conffiles b/debian/openssh-server.conffiles
deleted file mode 100644
index c67a8f45a..000000000
--- a/debian/openssh-server.conffiles
+++ /dev/null
@@ -1,3 +0,0 @@
-/etc/init.d/ssh
-/etc/pam.d/ssh
-/etc/default/ssh
diff --git a/debian/rules b/debian/rules
index 67d650ac4..f5365c022 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 # export DH_VERBOSE=1
 
 # This is the debhelper compatibility version to use.
-export DH_COMPAT=2
+export DH_COMPAT=3
 
 # This has to be exported to make some magic below work.
 export DH_OPTIONS