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/rules | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 11 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 0544b2b8e..24fb3b9be 100755 --- a/debian/rules +++ b/debian/rules @@ -70,10 +70,6 @@ APT_UTILS=ftparchive sortpkgs extracttemplates # Find the libapt-pkg major version for use in other control files include buildlib/libversion.mak -# Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(LIBAPTINST_MAJOR) - # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 @@ -137,7 +133,7 @@ libapt-pkg-doc: build-doc dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -165,7 +161,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https +binary-arch: libapt-pkg4.10 libapt-inst1.2 apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-doc dh_testdir -p$@ @@ -207,8 +203,8 @@ apt: build build-doc dh_fixperms -p$@ dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) + dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -227,7 +223,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -- -Vlibapt-pkg:provides=$(LIBAPTPKG_PROVIDE) -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ @@ -253,8 +249,42 @@ apt-utils: build dh_fixperms -p$@ dh_makeshlibs -p$@ dh_installdeb -p$@ - dh_shlibdeps -p$@ -l$(CURDIR)/debian/apt/usr/lib:$(CURDIR)/debian/$@/usr/lib - dh_gencontrol -p$@ -- -Vlibapt-inst:provides=$(LIBAPTINST_PROVIDE) + dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-inst2.1/usr/lib:$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +libapt-pkg4.10: build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + +libapt-inst1.2: build + dh_testdir -p$@ + dh_testroot -p$@ + dh_prep -p$@ + dh_installdirs -p$@ + + dh_install -p$@ --sourcedir=$(BLD) + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib + dh_gencontrol -p$@ dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3-70-g09d2 From f521559b96d303970f50daa2f9d64c6651861d7e Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 8 Jun 2011 17:38:55 +0200 Subject: do not include libapt-pkg* in apt itself, add missing dh_makeshlibs calls --- debian/apt.install | 1 - debian/rules | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/apt.install b/debian/apt.install index 979e04ce2..ba57f7efa 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -1,5 +1,4 @@ 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/ diff --git a/debian/rules b/debian/rules index 24fb3b9be..a466fbf8f 100755 --- a/debian/rules +++ b/debian/rules @@ -201,7 +201,6 @@ apt: build build-doc 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$@ @@ -266,6 +265,7 @@ libapt-pkg4.10: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ + dh_makeshlibs -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_makeshlibs -p$@ dh_shlibdeps -p$@ -l$(CURDIR)/debian/libapt-pkg4.10/usr/lib dh_gencontrol -p$@ dh_md5sums -p$@ -- 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/rules') 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/rules') 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 From 7eee083af5c4121ca74f3bbed23f04d3ca20d342 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 9 Jun 2011 14:46:31 +0200 Subject: do not hardcode the libnames --- debian/rules | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index e67f17237..fd894b73b 100755 --- a/debian/rules +++ b/debian/rules @@ -70,6 +70,10 @@ APT_UTILS=ftparchive sortpkgs extracttemplates # Find the libapt-pkg major version for use in other control files include buildlib/libversion.mak +# Determine which library package names to use +LIBAPT_PKG=libapt-pkg$(LIBAPTPKG_MAJOR) +LIBAPT_INST=libapt-inst$(LIBAPTINST_MAJOR) + # do not fail as we are just experimenting with symbol files for now export DPKG_GENSYMBOLS_CHECK_LEVEL=0 @@ -161,7 +165,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: libapt-pkg4.10 libapt-inst1.2 apt libapt-pkg-dev apt-utils apt-transport-https +binary-arch: $(LIBAPT_PKG) $(LIBAPT_INST) apt libapt-pkg-dev apt-utils apt-transport-https apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list apt: build build-doc dh_testdir -p$@ @@ -253,7 +257,7 @@ apt-utils: build dh_md5sums -p$@ dh_builddeb -p$@ -libapt-pkg4.10: build +$(LIBAPT_PKG): build dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ @@ -272,7 +276,7 @@ libapt-pkg4.10: build dh_md5sums -p$@ dh_builddeb -p$@ -libapt-inst1.2: build +$(LIBAPT_INST): build dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ -- cgit v1.2.3-70-g09d2 From 84736cfa351ec734f13cc0016f61108c81dc67e3 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 14:43:06 +0200 Subject: include mo files in the right packages --- debian/apt.install | 2 +- debian/libapt-inst1.2.install | 3 ++- debian/libapt-pkg4.10.install | 3 ++- debian/rules | 4 ++++ 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/apt.install b/debian/apt.install index ba57f7efa..9d4008fab 100644 --- a/debian/apt.install +++ b/debian/apt.install @@ -1,4 +1,4 @@ bin/apt-* usr/bin/ bin/methods/* usr/lib/apt/methods/ scripts/dselect/* usr/lib/dpkg/methods/apt/ -locale usr/share/ +usr/share/locale/*/*/apt.mo diff --git a/debian/libapt-inst1.2.install b/debian/libapt-inst1.2.install index 575199b53..b7b63be81 100644 --- a/debian/libapt-inst1.2.install +++ b/debian/libapt-inst1.2.install @@ -1 +1,2 @@ -bin/libapt-inst*.so.* usr/lib/ \ No newline at end of file +bin/libapt-inst*.so.* usr/lib/ +usr/share/locale/*/*/libapt-inst*.mo diff --git a/debian/libapt-pkg4.10.install b/debian/libapt-pkg4.10.install index 571dc8478..91b39a31b 100644 --- a/debian/libapt-pkg4.10.install +++ b/debian/libapt-pkg4.10.install @@ -1 +1,2 @@ -bin/libapt-pkg*.so.* usr/lib/ \ No newline at end of file +bin/libapt-pkg*.so.* usr/lib/ +usr/share/locale/*/*/libapt-pkg*.mo diff --git a/debian/rules b/debian/rules index fd894b73b..22eb82ca4 100755 --- a/debian/rules +++ b/debian/rules @@ -97,6 +97,10 @@ build/configure-stamp: configure build/build-stamp: build/configure-stamp # Add here commands to compile the package. $(MAKE) binary + # compat symlink for the locale split + mkdir -p build/usr/share + cd build/usr/share && ln -f -s ../../locale . + # done here touch $@ build/build-doc-stamp: build/configure-stamp -- cgit v1.2.3-70-g09d2 From 2cc4999b21d6a4db4e6e08fd3bb760b6030d38cc Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 14:48:57 +0200 Subject: generate debiandencies for libapt-pkg-dev automatically via deb-substvars --- debian/control | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian/rules') diff --git a/debian/control b/debian/control index 9aefcde8d..cf7be1ee5 100644 --- a/debian/control +++ b/debian/control @@ -52,7 +52,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: libapt-pkg4.10 (= ${binary:Version}), libapt-inst1.2 (= ${binary:Version}), ${misc:Depends}, zlib1g-dev | zlib-dev +Depends: ${libapt-pkg-name} (= ${binary:Version}), ${libapt-inst-name} (= ${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/rules b/debian/rules index 22eb82ca4..c55435315 100755 --- a/debian/rules +++ b/debian/rules @@ -230,7 +230,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ + dh_gencontrol -p$@ -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3-70-g09d2 From ceab242d7547968fa358b5c549207be209c381ef Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 10 Jun 2011 15:28:39 +0200 Subject: debian/rules: use substvars properly --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index c55435315..b6f45a38e 100755 --- a/debian/rules +++ b/debian/rules @@ -230,7 +230,7 @@ libapt-pkg-dev: build dh_compress -p$@ dh_fixperms -p$@ dh_installdeb -p$@ - dh_gencontrol -p$@ -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) + dh_gencontrol -p$@ -- -Vlibapt-pkg-name=$(LIBAPT_PKG) -Vlibapt-inst-name=$(LIBAPT_INST) dh_md5sums -p$@ dh_builddeb -p$@ -- cgit v1.2.3-70-g09d2