summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/control2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index eaef9b22..99286ff8 100644
--- 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 f0b2f69c..d8ba973d 100644
--- 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