* Move dh_makeshlibs ahead of dh_installdeb so that its...

Author: mdz
Date: 2003-08-10 23:54:57 GMT
* Move dh_makeshlibs ahead of dh_installdeb so that its postinst
fragments are properly substituted

diff --git a/debian/changelog b/debian/changelog
index a2ec41a884ac735b03069afd3782b3b487522394..193d7779b17ecac3eca7c153238a33ed5358120d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,8 +51,10 @@ apt (0.5.9) unstable; urgency=low
   * Build-depend on debhelper >= 4.1.62, because we need the fix for
     #204731 in order for dh_installman to work correctly
     with our SGML man pages
+  * Move dh_makeshlibs ahead of dh_installdeb so that its postinst
+    fragments are properly substituted
 
- -- Matt Zimmerman <mdz@debian.org>  Sun, 10 Aug 2003 01:26:59 -0400
+ -- Matt Zimmerman <mdz@debian.org>  Sun, 10 Aug 2003 19:54:39 -0400
 
 apt (0.5.8) unstable; urgency=medium
 

diff --git a/debian/rules b/debian/rules
index bf097773ee36e36e334b1a91657b4a6dbdd7ef06..9f13f71243c61d653c4e62489f6a6b16186b5182 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.53 2003/08/09 19:21:33 mdz Exp $
+# $Id: rules,v 1.54 2003/08/10 23:54:57 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.
@@ -218,10 +218,10 @@ apt: build debian/shlibs.local
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@
+       dh_makeshlibs -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' -papt
        dh_installdeb -p$@
        dh_shlibdeps -papt -l`pwd`/debian/apt/usr/lib -- -Ldebian/shlibs.local.apt
        dh_gencontrol -p$@ -u -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE)
-       dh_makeshlibs -m$(LIBAPTPKG_MAJOR) -V '$(LIBAPTPKG_PROVIDE)' -papt
        dh_md5sums -p$@
        dh_builddeb -p$@
 
@@ -274,10 +274,10 @@ apt-utils: build debian/shlibs.local
        dh_strip -p$@
        dh_compress -p$@
        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_gencontrol -p$@ -u -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE)
-       dh_makeshlibs -m$(LIBAPTINST_MAJOR) -V '$(LIBAPTINST_PROVIDE)' -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@