Add a Conflict on dpkg-cross << 2.0.0 to dpkg-dev

dpkg-cross was sourcing dpkg-buildpackage expecting it to be a shell
script, which is not true anymore.

diff --git a/debian/changelog b/debian/changelog
index 2d5efe2fa1ab63ad0d14b96350f8d202e8e0f706..3d52ccd79467fe49886e8f463426dfcb7bc23fdd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,8 @@ dpkg (1.14.8) UNRELEASED; urgency=low
     - Support new fields fields Package-Type, Subarchitecture, Kernel-Version
       and Installer-Menu-Item. Closes: #383916
     - New '--type' option for dpkg-scanpackages.
+  * Make dpkg-dev Conflict on dpkg-cross << 2.0.0 which was sourcing
+    dpkg-buildpackage expecting it to be a shell script. Closes: #445852
 
   [ Updated dselect translations ]
   * Czech (Miroslav Kure).

diff --git a/debian/control b/debian/control
index 8649146b3bcc32e3e4e364df0d20c96fccba6967..476e8ab3fafe899eb34d231f69a34358c238bfff 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -37,7 +37,7 @@ Depends: dpkg (>= 1.14.6), perl5, perl-modules, cpio (>= 2.4.2-2),
  patch (>= 2.2-1), make, binutils
 Recommends: gcc | c-compiler, bzip2
 Suggests: gnupg, debian-keyring
-Conflicts: dpkgname
+Conflicts: dpkgname, dpkg-cross (<< 2.0.0)
 Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja, manpages-pl (<= 20051117-1)
 Description: package building tools for Debian
  This package contains the tools (including dpkg-source) required to