Make the dpkg-iasearch conflicts versioned.

diff --git a/ChangeLog b/ChangeLog
index eddc03fa5eeb2e3c9a54d9c1115dc999077613a0..2000f0400834d628e0d9f480ac4386e7f27830bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Apr 15 00:16:44 CDT 2003 Adam Heath <doogie@debian.org>
+
+  * debian/control: Make the dpkg-iasearch conflicts versioned.
+
 Mon Apr 14 21:13:04 CDT 2003 Adam Heath <doogie@debian.org>
 
   * archtable: Updated for hurd.

diff --git a/debian/changelog b/debian/changelog
index ae78f21c268997a5c17400a05c51262a084b358b..5e525534118c5461895702f91c5809c6bffd6423 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.10.10) unstable; urgency=low
 
   * Update archtable for hurd.  Closes: #187509.
+  * Make the dpkg-iasearch conflicts versioned.  Closes: #170698.
 
  -- Adam Heath <doogie@debian.org>  UNRELEASED
 

diff --git a/debian/control b/debian/control
index dec2a42eac37d836537f01b115e0e0d7bf1e86b9..a6a34ec4432270e8ce81ed098fee6db07ff8baf1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: dselect, ${shlibs:Pre-Depends}
-Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch, dpkg-static, dpkg-dev (<< 1.9)
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static, dpkg-dev (<< 1.9)
 Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3)
 Description: Package maintenance system for Debian
  This package contains the programs which handle the installation and
@@ -31,7 +31,7 @@ Architecture: any
 Priority: optional
 Pre-Depends: dselect, ${shlibs:Pre-Depends}
 Replaces: dpkg-doc-ja, dpkg, manpages-de (<= 0.4-3)
-Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch, dpkg, dpkg-dev (<< 1.9)
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg, dpkg-dev (<< 1.9)
 Provides: dpkg
 Description: Package maintenance system for Debian (static compile)
  This package contains the programs which handle the installation and