remove -l from dh_shlibdeps, that is no longer needed with recent shlibdeps

diff --git a/debian/control b/debian/control
index 1bad67e0adbeac67462d176b7ef14e78bd62b11f..f4e87420158a9acb3c084cc66aa8a68d0c496903 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Description: Documentation for APT
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional
 Package: libapt-pkg-dev
 Architecture: any
 Priority: optional

-Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends}, zlib1g-dev | zlib-dev
+Depends: libapt-pkg4.10, libapt-inst1.2, ${misc:Depends}, zlib1g-dev | zlib-dev

 Section: libdevel
 Description: Development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for
 Section: libdevel
 Description: Development files for APT's libapt-pkg and libapt-inst
  This package contains the header files and libraries for


@@ -74,7 +74,6 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}

-Provides: ${libapt-inst:provides}

 Description: APT utility programs
  This package contains some APT utility programs such as apt-ftparchive,
  apt-sortpkgs and apt-extracttemplates.
 Description: APT utility programs
  This package contains some APT utility programs such as apt-ftparchive,
  apt-sortpkgs and apt-extracttemplates.

diff --git a/debian/rules b/debian/rules
index a466fbf8fdb91f1de0c496293e11d53881b594c6..7405f860118b4cc33ff56e078796a0503a714d86 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -202,7 +202,7 @@ apt: build build-doc
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

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

        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@


@@ -248,7 +248,7 @@ apt-utils: build
        dh_fixperms -p$@
        dh_makeshlibs -p$@
        dh_installdeb -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_shlibdeps -p$@

        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@


@@ -284,7 +284,7 @@ libapt-inst1.2: build
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_makeshlibs -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_makeshlibs -p$@

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

        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@


@@ -307,7 +307,7 @@ apt-transport-https: build libapt-pkg-dev
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@
        dh_compress -p$@
        dh_fixperms -p$@
        dh_installdeb -p$@

-       dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib
+       dh_shlibdeps -p$@ 

        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@
        dh_gencontrol -p$@
        dh_md5sums -p$@
        dh_builddeb -p$@