While working on my dpkg-dev bug squashing I noticed that dpkg's debian
control has some very old stuff in it that is probably not needed
anymore, like conflicts that are against potato packages or versioned
dependencies that are automatically satisfied in woody and later.
I propose to clean up this stuff a bit to reduce the amount of cruft
that gets assembled over the years.
See the attached patch for the details.
([EMAIL PROTECTED]/dpkg--devel--1.13--patch-26)
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
* looking for [EMAIL PROTECTED]/dpkg--devel--1.13--patch-25 to compare with
* comparing to [EMAIL PROTECTED]/dpkg--devel--1.13--patch-25
A {arch}/dpkg/dpkg--devel/dpkg--devel--1.13/[EMAIL
PROTECTED]/patch-log/patch-26
M debian/control
M debian/changelog
M ChangeLog
* modified files
--- orig/ChangeLog
+++ mod/ChangeLog
@@ -1,3 +1,15 @@
+2005-10-08 Frank Lichtenheld <[EMAIL PROTECTED]>
+
+ * debian/control: Remove potato-specifc dependencies and
+ conflicts. No need to keep that cruft around:
+ (Build-Depends) Remove version from zlib1g-dev
+ ([dpkg]Conflicts) Remove versioned conflict with sysvinit
+ ([dpkg]Depends) Remove version from cpio and patch.
+ Merge dependencies on perl5 and perl-modules to perl.
+ ([dpkg-dev]Conflicts) Remove conflicts with dpkgname
+ ([dpkg-dev]Replaces) Remove dpkgname and versioned
+ replaces on dpkg.
+
2005-10-07 Frank Lichtenheld <[EMAIL PROTECTED]>
* scripts/controllib.pl:
--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,5 +1,8 @@
dpkg (1.13.12~) unstable; urgency=low
+ * Remove potato-specific dependencies and conflicts in
+ debian/control. (Frank Lichtenheld)
+
* Fixes to dpkg-dev (Frank Lichtenheld):
- Let dpkg-gencontrol bail out with an error if parsedep
found an error while parsing a dependency field. Closes: #228125
--- orig/debian/control
+++ mod/debian/control
@@ -5,14 +5,14 @@
Origin: debian
Bugs: debbugs://bugs.debian.org
Standards-Version: 3.6.1.0
-Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev,
zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev, libselinux1-dev [!hurd-i386]
+Build-Depends: debhelper (>= 4.1.81), libncurses5-dev | libncurses-dev,
zlib1g-dev, libbz2-dev, libselinux1-dev [!hurd-i386]
Package: dpkg
Architecture: any
Essential: yes
Pre-Depends: ${shlibs:Depends}
Depends: coreutils | textutils (>= 2.0-3)
-Conflicts: sysvinit (<< 2.82-1), dpkg-iasearch (<< 0.11), dpkg-static,
dpkg-dev (<< 1.10)
+Conflicts: dpkg-iasearch (<< 0.11), dpkg-static, dpkg-dev (<< 1.10)
Replaces: dpkg-doc-ja, dpkg-static, manpages-de (<= 0.4-3)
Suggests: apt
Description: package maintenance system for Debian
@@ -26,11 +26,10 @@
Section: utils
Priority: standard
Architecture: all
-Depends: dpkg (>= 1.13.1), perl5, perl-modules, cpio (>= 2.4.2-2), patch (>=
2.2-1), make, binutils
+Depends: dpkg (>= 1.13.1), perl, cpio, patch, make, binutils
Recommends: gcc | c-compiler, bzip2
Suggests: gnupg, debian-keyring
-Conflicts: dpkgname
-Replaces: dpkgname, dpkg (<< 1.4.1.8), dpkg-doc-ja
+Replaces: dpkg-doc-ja
Description: package building tools for Debian
This package contains the tools (including dpkg-source) required to
unpack, build and upload Debian source packages.
* added files
--- /dev/null
+++ /home/djpig/debian/patch26/,,[EMAIL
PROTECTED]/new-files-archive/./{arch}/dpkg/dpkg--devel/dpkg--devel--1.13/[EMAIL
PROTECTED]/patch-log/patch-26
@@ -0,0 +1,19 @@
+Revision: dpkg--devel--1.13--patch-26
+Archive: [EMAIL PROTECTED]
+Creator: Frank Lichtenheld <[EMAIL PROTECTED]>
+Date: Sat Oct 8 13:46:22 CEST 2005
+Standard-date: 2005-10-08 11:46:22 GMT
+Modified-files: ChangeLog debian/changelog debian/control
+New-patches: [EMAIL PROTECTED]/dpkg--devel--1.13--patch-26
+Summary: Remove potato-specifc dependencies and conflicts in debian/control
+Keywords: control
+
+* debian/control: Remove potato-specifc dependencies and
+conflicts. No need to keep that cruft around:
+(Build-Depends) Remove version from zlib1g-dev
+([dpkg]Conflicts) Remove versioned conflict with sysvinit
+([dpkg]Depends) Remove version from cpio and patch.
+Merge dependencies on perl5 and perl-modules to perl.
+([dpkg-dev]Conflicts) Remove conflicts with dpkgname
+([dpkg-dev]Replaces) Remove dpkgname and versioned
+replaces on dpkg.
