* debian/control: Several fixes:

  * dpkg-static needs the same set of Depends(and others) lines as dpkg.
  * Modify the dpkg-static description to note that it's a static compile.
  * Bump the conflicts on sysvinit to 2.82-1, as that is the version that
    actually has the proper replaces line.
* debian/rules: dpkg-static was actually being built as dpkg.deb.

diff --git a/ChangeLog b/ChangeLog
index 4172c57b4dd46bf2f14d7673541c38e0e117d5c2..52ff702644595b959cfe4566571c18f3b0578444 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Sun Oct  7 03:12:35 CDT 2001 Adam Heath <doogie@debian.org>
+
+  * debian/control: Several fixes:
+    * dpkg-static needs the same set of Depends(and others) lines as dpkg.
+    * Modify the dpkg-static description to note that it's a static
+      compile.
+    * Bump the conflicts on sysvinit to 2.82-1, as that is the version
+      that actually has the proper replaces line.
+  * debian/rules: dpkg-static was actually being built as dpkg.deb.
+
 Thu Sep 20 17:06:48 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * debian/rules: strip enoent as well

diff --git a/debian/control b/debian/control
index 608f0eda9aa497e1865d6be7b4bacd72daf4c875..671044da08c9307ab91aca00aea147ba5572417e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: dpkg
 Architecture: any
 Essential: yes
 Pre-Depends: dselect, ${shlibs:Pre-Depends}
-Conflicts: sysvinit (<< 2.80)
+Conflicts: sysvinit (<< 2.82-1)
 Replaces: dpkg-doc-ja, dpkg-static
 Conflicts: dpkg-static
 Description: Package maintenance system for Debian
@@ -28,12 +28,12 @@ Description: Package maintenance system for Debian
 Package: dpkg-static
 Architecture: any
 Priority: optional
-Pre-Depends: ${shlibs:Pre-Depends}
-Depends: sysvinit (>= 2.80)
+Pre-Depends: dselect, ${shlibs:Pre-Depends}
+Depends: sysvinit (>= 2.82-1)
 Replaces: dpkg-doc-ja, dpkg
 Conflicts: dpkg
 Provides: dpkg
-Description: Package maintenance system for Debian
+Description: Package maintenance system for Debian (static compile)
  This package contains the programs which handle the installation and
  removal of packages on your system.
  .
@@ -43,6 +43,8 @@ Description: Package maintenance system for Debian
  .
  In order to unpack and build Debian source packages you will need to
  install the developers' package `dpkg-dev' as well as this one.
+ .
+ This version has a dpkg binary that is linked statically.
 
 Package: dpkg-dev
 Section: utils

diff --git a/debian/rules b/debian/rules
index 128fcbc122e1138c13c5844e520c510238c4f7f9..8a56c5e8d054741959f00bb465c211d9887c25a9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -72,6 +72,7 @@ stamp-binary: stamp-build
 binary-dpkg-static-most:       TMP_DPKG=$(TMP)/dpkg-static
 binary-dpkg-static-most:       static=-static
 binary-dpkg-static:            TMP_DPKG=$(TMP)/dpkg-static
+binary-dpkg-static:            static=-static
 
 binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
        rm -rf $(TMP_DPKG)