Conflict with too old automake for AM_UPDATE_INFO_DIR=no. Closes: #666901

diff --git a/debian/changelog b/debian/changelog
index eaef9b220303fd442fce2c7bc78fe8c0f1d2867d..99286ff8d004f3c5679c31a56ff3fefdb4ed0f67 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 debhelper (9.20120323) UNRELEASED; urgency=low
 
   * Fix a typo. Closes: #665891
+  * Conflict with too old automake for AM_UPDATE_INFO_DIR=no. Closes: #666901
 
  -- Joey Hess <joeyh@debian.org>  Mon, 26 Mar 2012 17:18:58 -0400
 

diff --git a/debian/control b/debian/control
index f0b2f69cc3c3809d93d420758a26b4c27ecf0734..d8ba973d5323f542fa7694e852a5f7b2934e97ba 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Package: debhelper
 Architecture: all
 Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.16.0), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
 Suggests: dh-make
-Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6)
+Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6), automake (<< 1.11.2)
 Description: helper programs for debian/rules
  A collection of programs that can be used in a debian/rules file to
  automate common tasks related to building debian packages. Programs