3 files changed, 16 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 914903924..b8bc57a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openssh (1:6.2p2-6) UNRELEASED; urgency=low
+
+  * Update config.guess and config.sub automatically at build time.
+    dh_autoreconf does not take care of that by default because openssh does
+    not use automake.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 02 Jul 2013 22:53:47 +0100
+
 openssh (1:6.2p2-5) unstable; urgency=low
 
   [ Colin Watson ]
diff --git a/debian/control b/debian/control
index e54ccae8e..82fdde9e6 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.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev (>= 1:1.2.3-1), libssl-dev (>= 0.9.8g), libpam0g-dev | libpam-dev, libgtk2.0-dev, libedit-dev, debhelper (>= 8.1.0~), libselinux1-dev [linux-any], libkrb5-dev | heimdal-dev, dpkg (>= 1.16.1~), libck-connector-dev, dh-autoreconf, autotools-dev
 Standards-Version: 3.8.4
 Uploaders: Colin Watson <cjwatson@debian.org>, Matthew Vernon <matthew@debian.org>
 Homepage: http://www.openssh.org/
diff --git a/debian/rules b/debian/rules
index cb7932e3b..d53bafa4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -116,6 +116,13 @@ confflags_udeb += --with-ldflags='-Wl,--as-needed'
 %:
         dh $@ --with=autoreconf
 
+autoreconf:
+        autoreconf -f -i
+        cp -f /usr/share/misc/config.guess /usr/share/misc/config.sub ./
+
+override_dh_autoreconf:
+        dh_autoreconf debian/rules -- autoreconf
+
 override_dh_auto_configure:
         dh_auto_configure -Bbuild-deb -- $(confflags)
         dh_auto_configure -Bbuild-udeb -- $(confflags_udeb)