do not include libapt-pkg* in apt itself, add missing dh_makeshlibs calls

diff --git a/debian/apt.install b/debian/apt.install
index 979e04ce2036e3b1096cc009da0f0d26bbe29b2f..ba57f7efa0c2cb77c1e93b8c1952ec856241791b 100644 (file)
--- a/debian/apt.install
+++ b/debian/apt.install
@@ -1,5 +1,4 @@
 bin/apt-* usr/bin/
 bin/apt-* usr/bin/

-bin/libapt-pkg*.so.* usr/lib/

 bin/methods/* usr/lib/apt/methods/
 scripts/dselect/* usr/lib/dpkg/methods/apt/
 locale usr/share/
 bin/methods/* usr/lib/apt/methods/
 scripts/dselect/* usr/lib/dpkg/methods/apt/
 locale usr/share/

diff --git a/debian/rules b/debian/rules
index 24fb3b9beb69a66d4c41cc5cbc89c6fe4d43aaec..a466fbf8fdb91f1de0c496293e11d53881b594c6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -201,7 +201,6 @@ apt: build build-doc
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_strip -p$@
        dh_compress -p$@
        dh_fixperms -p$@

-       dh_makeshlibs -p$@

        dh_installdeb -p$@
        dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib
        dh_gencontrol -p$@
        dh_installdeb -p$@
        dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib
        dh_gencontrol -p$@


@@ -266,6 +265,7 @@ libapt-pkg4.10: build
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

+       dh_makeshlibs -p$@

        dh_shlibdeps -p$@ 
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_shlibdeps -p$@ 
        dh_gencontrol -p$@
        dh_md5sums -p$@


@@ -283,6 +283,7 @@ libapt-inst1.2: build
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

+       dh_makeshlibs -p$@

        dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib
        dh_gencontrol -p$@
        dh_md5sums -p$@