summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog8
-rw-r--r--debian/control2
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index c86f25e..cf3c948 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (4.2.20) unstable; urgency=HIGH
+
+ * dpkg-cross is fixed in unstable, version the conflict. Closes: #265777
+
+ -- Joey Hess <joeyh@debian.org> Wed, 25 Aug 2004 08:05:42 -0400
+
debhelper (4.2.19) unstable; urgency=HIGH
* Conflict with dpkg-cross since it breaks dh_strip.
@@ -334,7 +340,7 @@ debhelper (4.1.71) unstable; urgency=low
debhelper (4.1.70) unstable; urgency=low
- * Complete Spanish translation of all man pages thanks to Rubén Porras
+ * Complete Spanish translation of all man pages thanks to Rubén Porras
Campo, Rudy Godoy, and the rest of the Spanish translation team.
Closes: #199261
diff --git a/debian/control b/debian/control
index 3305043..ec19e89 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: debhelper
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, coreutils | fileutils (>= 4.0-2.1), file (>= 3.23-1), dpkg-dev (>= 1.7.0), html2text, debconf-utils (>= 1.1.1), binutils, po-debconf
Suggests: dh-make
-Conflicts: dpkg-cross
+Conflicts: dpkg-cross (<< 1.18)
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