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 a6ec5daa5511a6f10280385b6f7da8c351795fb2..f389924fca718e44dd699d3d07faf7c78d5da6a6 100644 (file)
--- 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 c86f25e5bf0e64bc36b1d9af6cebad61b38a22ac..cf3c9489b2200facb351b9884364141d5245e411 100644 (file)
--- 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 3305043e459cd41799afca757fbc9510592263c8..ec19e89b32b0f4872184b32f196b640107a9a4d8 100644 (file)
--- 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