From 3be09a4f9dad9974527bd33e70b808446509ab42 Mon Sep 17 00:00:00 2001 From: Wichert Akkerman Date: Tue, 2 Jul 2002 07:42:48 +0000 Subject: [PATCH] sync dpkg and dpkg-static dependencies, fix double conflict for dpkg --- ChangeLog | 5 +++++ debian/changelog | 1 + debian/control | 8 +++----- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37effb3c..48b6a14c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jul 2 09:41:44 CEST 2002 Wichert Akkerman + + * debian/control: sync dpkg and dpkg-static dependencies, fix double + conflict for dpkg + Tue Jul 2 01:04:29 CDT 2002 Adam Heath * debian/rules: Don't always call autoheader during build. diff --git a/debian/changelog b/debian/changelog index 64668fdd..57bb4ada 100644 --- 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 UNRELEASED diff --git a/debian/control b/debian/control index 3e445c2f..7ac1f687 100644 --- 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 -- 2.39.5