Преглед изворни кода

* 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.

Adam Heath пре 25 година
родитељ
комит
d62ca58175
3 измењених фајлова са 17 додато и 4 уклоњено
  1. 10 0
      ChangeLog
  2. 6 4
      debian/control
  3. 1 0
      debian/rules

+ 10 - 0
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>
 Thu Sep 20 17:06:48 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
 
   * debian/rules: strip enoent as well
   * debian/rules: strip enoent as well

+ 6 - 4
debian/control

@@ -11,7 +11,7 @@ Package: dpkg
 Architecture: any
 Architecture: any
 Essential: yes
 Essential: yes
 Pre-Depends: dselect, ${shlibs:Pre-Depends}
 Pre-Depends: dselect, ${shlibs:Pre-Depends}
-Conflicts: sysvinit (<< 2.80)
+Conflicts: sysvinit (<< 2.82-1)
 Replaces: dpkg-doc-ja, dpkg-static
 Replaces: dpkg-doc-ja, dpkg-static
 Conflicts: dpkg-static
 Conflicts: dpkg-static
 Description: Package maintenance system for Debian
 Description: Package maintenance system for Debian
@@ -28,12 +28,12 @@ Description: Package maintenance system for Debian
 Package: dpkg-static
 Package: dpkg-static
 Architecture: any
 Architecture: any
 Priority: optional
 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
 Replaces: dpkg-doc-ja, dpkg
 Conflicts: dpkg
 Conflicts: dpkg
 Provides: 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
  This package contains the programs which handle the installation and
  removal of packages on your system.
  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
  In order to unpack and build Debian source packages you will need to
  install the developers' package `dpkg-dev' as well as this one.
  install the developers' package `dpkg-dev' as well as this one.
+ .
+ This version has a dpkg binary that is linked statically.
 
 
 Package: dpkg-dev
 Package: dpkg-dev
 Section: utils
 Section: utils

+ 1 - 0
debian/rules

@@ -72,6 +72,7 @@ stamp-binary: stamp-build
 binary-dpkg-static-most:	TMP_DPKG=$(TMP)/dpkg-static
 binary-dpkg-static-most:	TMP_DPKG=$(TMP)/dpkg-static
 binary-dpkg-static-most:	static=-static
 binary-dpkg-static-most:	static=-static
 binary-dpkg-static:		TMP_DPKG=$(TMP)/dpkg-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%
 binary-dpkg-most binary-dpkg-static-most: binary-dpkg%-most: stamp-binary%
 	rm -rf $(TMP_DPKG)
 	rm -rf $(TMP_DPKG)