From: Adam Heath Date: Tue, 15 Apr 2003 05:17:39 +0000 (+0000) Subject: Make the dpkg-iasearch conflicts versioned. X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77516846fb2c11aa662231ce5e656e311e979f54;p=dpkg Make the dpkg-iasearch conflicts versioned. --- diff --git a/ChangeLog b/ChangeLog index eddc03fa..2000f040 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Apr 15 00:16:44 CDT 2003 Adam Heath + + * debian/control: Make the dpkg-iasearch conflicts versioned. + Mon Apr 14 21:13:04 CDT 2003 Adam Heath * archtable: Updated for hurd. diff --git a/debian/changelog b/debian/changelog index ae78f21c..5e525534 100644 --- 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 UNRELEASED diff --git a/debian/control b/debian/control index dec2a42e..a6a34ec4 100644 --- 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