sync dpkg and dpkg-static dependencies, fix double conflict for dpkg

diff --git a/ChangeLog b/ChangeLog
index 37effb3c4c30ca900755023c8d1d331296074cec..48b6a14cace8f4fde7f99efdcfae613a52a56d41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jul  2 09:41:44 CEST 2002 Wichert Akkerman <wichert@deephackmode.org>
+
+  * debian/control: sync dpkg and dpkg-static dependencies, fix double
+    conflict for dpkg
+
 Tue Jul  2 01:04:29 CDT 2002 Adam Heath <doogie@debian.org>
 
   * debian/rules: Don't always call autoheader during build.

diff --git a/debian/changelog b/debian/changelog
index 64668fdd6fb7b2e5cdd5fc94e0fbc1d7c5bea817..57bb4ada90eb85ab4e6a8b3ff3b3e7b9d062223c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dpkg (1.10.1) unstable; urgency=low
   * Replace manpages-de which includes one of our manpages  Closes:
     #151485.
   * Don't always call autoheader when building.  Closes: #151471.
+  * Fix double conflict in dpkg. Closes: Bug#151581
 
  -- Wichert Akkerman <wakkerma@debian.org>  UNRELEASED
 

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