From 782486e8219705249d9096c79638bd85b930522d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:12:32 +0200 Subject: initial librarification push --- debian/control | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 6d0f16b70..1bad67e0a 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,6 @@ Architecture: any Pre-Depends: ${shlibs:Depends} Depends: debian-archive-keyring, ${misc:Depends}, gnupg Replaces: manpages-pl (<< 20060617-3~) -Provides: ${libapt-pkg:provides} Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg @@ -27,6 +26,20 @@ Description: Advanced front-end for dpkg APT features complete installation ordering, multiple source capability and several other unique features, see the Users Guide in apt-doc. +Package: libapt-pkg4.10 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: apt (<< 0.8.15) +Description: Library for apt + This package contains the library used by apt. + +Package: libapt-inst1.2 +Architecture: any +Depends: ${shlibs:Depends} +Replaces: apt-utils (<< 0.8.15) +Description: Install library for apt + This package contains the inst library used by apt. + Package: apt-doc Architecture: all Priority: optional -- cgit v1.2.3-70-g09d2 From bd5e34e8cf0673248a3ab386c25b062247f10370 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:59:07 +0200 Subject: remove -l from dh_shlibdeps, that is no longer needed with recent shlibdeps --- debian/control | 3 +-- debian/rules | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 1bad67e0a..f4e874201 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Description: Documentation for APT 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 @@ -74,7 +74,6 @@ Description: Documentation for APT development 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. diff --git a/debian/rules b/debian/rules index a466fbf8f..7405f8601 100755 --- a/debian/rules +++ b/debian/rules @@ -202,7 +202,7 @@ apt: build build-doc 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$@ @@ -248,7 +248,7 @@ apt-utils: build 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$@ @@ -284,7 +284,7 @@ libapt-inst1.2: build 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$@ @@ -307,7 +307,7 @@ apt-transport-https: build libapt-pkg-dev 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$@ -- cgit v1.2.3-70-g09d2 From 08c9b19106097fda61ab2df703c68a65131277a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 18:18:06 +0200 Subject: fix lintian issues --- debian/control | 6 +++--- debian/libapt-inst1.2.symbols | 2 +- debian/libapt-pkg4.10.symbols | 2 +- debian/rules | 6 ++++-- 4 files changed, 9 insertions(+), 7 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index f4e874201..9aefcde8d 100644 --- a/debian/control +++ b/debian/control @@ -28,14 +28,14 @@ Description: Advanced front-end for dpkg Package: libapt-pkg4.10 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt (<< 0.8.15) Description: Library for apt This package contains the library used by apt. Package: libapt-inst1.2 Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: apt-utils (<< 0.8.15) Description: Install library for apt This package contains the inst library used by apt. @@ -52,7 +52,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: libapt-pkg4.10, libapt-inst1.2, ${misc:Depends}, zlib1g-dev | zlib-dev +Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${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 diff --git a/debian/libapt-inst1.2.symbols b/debian/libapt-inst1.2.symbols index 9ba283a51..091a3b185 100644 --- a/debian/libapt-inst1.2.symbols +++ b/debian/libapt-inst1.2.symbols @@ -1,5 +1,5 @@ libapt-inst.so.1.2 libapt-inst1.2 -| apt-utils #MINVER# +| libapt-inst1.2 #MINVER# * Build-Depends-Package: libapt-pkg-dev (c++)"ExtractTar::Done(bool)@Base" 0.8.0 (c++)"ExtractTar::Go(pkgDirStream&)@Base" 0.8.0 diff --git a/debian/libapt-pkg4.10.symbols b/debian/libapt-pkg4.10.symbols index bb60c22be..a93e09f59 100644 --- a/debian/libapt-pkg4.10.symbols +++ b/debian/libapt-pkg4.10.symbols @@ -1,5 +1,5 @@ libapt-pkg.so.4.10 libapt-pkg4.10 -| apt #MINVER# +| libapt-pkg4.10 #MINVER# * Build-Depends-Package: libapt-pkg-dev TFRewritePackageOrder@Base 0.8.0 TFRewriteSourceOrder@Base 0.8.0 diff --git a/debian/rules b/debian/rules index 7405f8601..e67f17237 100755 --- a/debian/rules +++ b/debian/rules @@ -260,12 +260,13 @@ libapt-pkg4.10: build dh_installdirs -p$@ dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_installdeb -p$@ dh_makeshlibs -p$@ + dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ @@ -278,12 +279,13 @@ libapt-inst1.2: build dh_installdirs -p$@ dh_install -p$@ --sourcedir=$(BLD) + dh_installdocs -p$@ dh_installchangelogs -p$@ dh_strip -p$@ dh_compress -p$@ dh_fixperms -p$@ - dh_installdeb -p$@ dh_makeshlibs -p$@ + dh_installdeb -p$@ dh_shlibdeps -p$@ dh_gencontrol -p$@ dh_md5sums -p$@ -- cgit v1.2.3-70-g09d2