* Make debian/rules a bit more consistent in a few places.

Author: mdz
Date: 2004-02-27 00:51:25 GMT
* Make debian/rules a bit more consistent in a few places.
Specifically, always use -p$@ rather than an explicit package name,
and always specify it first, and use dh_shlibdeps -l uniformly rather
than sometimes changing LD_LIBRARY_PATH dircetly

diff --git a/debian/changelog b/debian/changelog
index 22aced9..feee3c4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ apt (0.5.23) unstable; urgency=low
 
   * Cosmetic updates to XML man pages from Richard Bos <radoeka@xs4all.nl>
   * Use the 'binary' target rather than 'all' so that the ssh and bzip2
-    symlinks are created correctly
+    symlinks are created correctly (thanks to Adam Heath)
   * Updated Simplified Chinese translation of message catalog from Tchaikov
     <chaisave@263.net> (Closes: #234186)
   * Set Cache-Control: max-age=0 for index files to prevent them being out
@@ -16,6 +16,10 @@ apt (0.5.23) unstable; urgency=low
   * Print a slightly clearer error message if no packaging systems are
     available (Closes: #233681)
   * Point to Build-Depends in COMPILING (Closes: #233669)
+  * Make debian/rules a bit more consistent in a few places.
+    Specifically, always use -p$@ rather than an explicit package name,
+    and always specify it first, and use dh_shlibdeps -l uniformly rather
+    than sometimes changing LD_LIBRARY_PATH dircetly
 
  --
 

diff --git a/debian/rules b/debian/rules
index 0ac423c..809e269 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
-# $Id: rules,v 1.62 2003/12/24 22:55:30 mdz Exp $
+# $Id: rules,v 1.63 2004/02/27 00:51:25 mdz Exp $
 
 # LD_LIBRARY_PATH=pwd/debian/apt/usr/lib dh_shlibdeps -papt
 # dpkg: /home/jgg/work/apt2/debian/apt/usr/lib/libapt-pkg.so.2.9 not found.
@@ -210,9 +210,9 @@ apt: build debian/shlibs.local
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@
-       dh_makeshlibs -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' -papt
+       dh_makeshlibs -p$@ -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)'
        dh_installdeb -p$@
-       dh_shlibdeps -papt -l`pwd`/debian/apt/usr/lib -- -Ldebian/shlibs.local.apt
+       dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib -- -Ldebian/shlibs.local.apt
        dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
        dh_md5sums -p$@
        dh_builddeb -p$@
@@ -268,7 +268,7 @@ apt-utils: build debian/shlibs.local
        dh_fixperms -p$@
        dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@
        dh_installdeb -p$@
-       LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib dh_shlibdeps -p$@ -- -Ldebian/shlibs.local.apt-utils
+       dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib -- -Ldebian/shlibs.local.apt-utils
        dh_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
        dh_md5sums -p$@
        dh_builddeb -p$@