r1713: releasing version 4.2.19

diff --git a/debian/changelog b/debian/changelog
index f669d8689752ff0a6b135adb2ae0ea63307a5597..c86f25e5bf0e64bc36b1d9af6cebad61b38a22ac 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (4.2.19) unstable; urgency=HIGH
+
+  * Conflict with dpkg-cross since it breaks dh_strip.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 13 Aug 2004 21:50:12 -0300
+
 debhelper (4.2.18) unstable; urgency=low
 
   * Add dh_shlibdeps see also. Closes: #261367a

diff --git a/debian/control b/debian/control
index 9f0001ee9963c2c8b5bb6883e31823e50597bd2f..3305043e459cd41799afca757fbc9510592263c8 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,6 +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
 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