From dcf2be1ed00127eb70dbb678285aa469314aa8b8 Mon Sep 17 00:00:00 2001
From: joey <joey>
Date: Sat, 14 Aug 2004 00:51:52 +0000
Subject: r1713: releasing version 4.2.19

---
 debian/changelog | 6 ++++++
 debian/control   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f669d868..c86f25e5 100644
--- 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 9f0001ee..3305043e 100644
--- 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
-- 
cgit v1.2.3