Update dpkg conflicts to << 1.10, instead of 1.9.

diff --git a/ChangeLog b/ChangeLog
index 9f89ee71b83d07ae5e874707738114c7ce7bcc39..df7f476dfac74207ff00711fb435330d2f8dd95a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 27 20:08:12 CST 2003 Adam Heath <doogie@debian.org>
+
+  * debian/control: Update dpkg conflicts to << 1.10, instead of 1.9.
+
 Mon Oct 27 13:39:56 CST 2003 Adam Heath <doogie@debian.org>
 
   * version-nr, debian/changelog: Rebuild, tagging and releasing correctly

diff --git a/debian/changelog b/debian/changelog
index e5aea06cfd222c0f5adf3700ca0b69ad53f557bb..3e2a5f07c0678d2274881f9ced6c1f44c6dae72f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.10.19) unstable; urgency=medium
+
+  * Update dpkg conflicts to << 1.10, instead of 1.9.  Closes: #190611.
+
+ -- Adam Heath <doogie@debian.org>  UNRELEASED
+
 dpkg (1.10.18) unstable; urgency=medium
 
   * Rebuild, tagging and releasing correctly from cvs this time.

diff --git a/debian/control b/debian/control
index 1ac9e19dbc479cc73bfb50f18582596a7460d139..f09667e1821ad8fa9f42fbcf40dbf86bb21dea8a 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 (<< 0.11), dpkg-static, dpkg-dev (<< 1.9)
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static, dpkg-dev (<< 1.10)
 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 (<< 0.11), dpkg, dpkg-dev (<< 1.9)
+Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg, dpkg-dev (<< 1.10)
 Provides: dpkg
 Description: Package maintenance system for Debian (static compile)
  This package contains the programs which handle the installation and