From: joey <joey>
Date: Wed, 25 Aug 2004 12:36:36 +0000 (+0000)
Subject: r1715:   * dpkg-cross is fixed in unstable, version the conflict. Closes: #265777
X-Git-Tag: 4.2.20^0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=76e0152750d4ee75ce7529a9a61205cee198d2b7;p=debhelper.git

r1715:   * dpkg-cross is fixed in unstable, version the conflict. Closes: #265777
  * Complete Spanish translation of all man pages thanks to Rubén Porras
---

diff --git a/debhelper.pod b/debhelper.pod
index a6ec5da..f389924 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -145,7 +145,7 @@ Do not modify postinst/postrm/etc scripts.
 Exclude an item from processing. This option may be used multiple times,
 to exclude more than one thing.
 
-=item B<-A>, B<-all>
+=item B<-A>, B<--all>
 
 Makes files or other items that are specified on the command line take effect
 in ALL packages acted on, not just the first.
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