From cb1a690cbab6d83b0301f65761d9c49d682dc678 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 22 Nov 2011 10:41:25 +0100 Subject: merged libapt multiarch enable patch from Colin Watson, many thanks! --- debian/control | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 7efb6ca8a..24c429ad4 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt , Otavio Salvador , Christian Perrier , Daniel Burrows , Julian Andres Klode Standards-Version: 3.9.2 -Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 7.2.3~), libdb-dev, +Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.0), zlib1g-dev | libz-dev, debiandoc-sgml, xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen @@ -35,9 +35,20 @@ Description: APT's commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys +Package: libapt-common +Architecture: all +Multi-Arch: foreign +Depends: ${misc:Depends} +Breaks: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) +Replaces: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) +Description: Common files for APT libraries + This package includes translation files common to APT library packages. + Package: libapt-pkg4.12 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -56,7 +67,9 @@ Description: APT's package managment runtime library Package: libapt-inst1.4 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common Description: APT's deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package @@ -73,7 +86,9 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any +Multi-Arch: same Priority: optional +Pre-Depends: ${misc:Pre-Depends} 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 -- cgit v1.2.3-70-g09d2 From 386566e36bedb453eb6f914e8e14fd555a2bf111 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 28 Nov 2011 12:07:55 +0100 Subject: revert libapt-common addition because of http://lists.debian.org/debian-devel/2011/11/msg00742.html --- debian/control | 13 ++----------- debian/libapt-inst1.4.install.in | 1 + debian/libapt-pkg4.12.install.in | 1 + debian/rules | 19 +------------------ 4 files changed, 5 insertions(+), 29 deletions(-) (limited to 'debian/control') diff --git a/debian/control b/debian/control index 24c429ad4..03d74c51f 100644 --- a/debian/control +++ b/debian/control @@ -35,20 +35,11 @@ Description: APT's commandline package manager * apt-config as an interface to the configuration settings * apt-key as an interface to manage authentication keys -Package: libapt-common -Architecture: all -Multi-Arch: foreign -Depends: ${misc:Depends} -Breaks: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) -Replaces: libapt-pkg4.12 (<< 0.8.16~exp9), libapt-inst1.4 (<< 0.8.16~exp9) -Description: Common files for APT libraries - This package includes translation files common to APT library packages. - Package: libapt-pkg4.12 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common +Depends: ${shlibs:Depends}, ${misc:Depends} Description: APT's package managment runtime library This library provides the common functionality for searching and managing packages as well as information about packages. @@ -69,7 +60,7 @@ Package: libapt-inst1.4 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libapt-common +Depends: ${shlibs:Depends}, ${misc:Depends} Description: APT's deb package format runtime library This library provides methods to query and extract information from deb packages. This includes the control data and the package diff --git a/debian/libapt-inst1.4.install.in b/debian/libapt-inst1.4.install.in index b81d15c10..8bcce2c28 100644 --- a/debian/libapt-inst1.4.install.in +++ b/debian/libapt-inst1.4.install.in @@ -1 +1,2 @@ bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ +usr/share/locale/*/*/libapt-inst*.mo diff --git a/debian/libapt-pkg4.12.install.in b/debian/libapt-pkg4.12.install.in index 0db4075fa..56bed39d3 100644 --- a/debian/libapt-pkg4.12.install.in +++ b/debian/libapt-pkg4.12.install.in @@ -1 +1,2 @@ bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/ +usr/share/locale/*/*/libapt-pkg*.mo diff --git a/debian/rules b/debian/rules index 6a5c95d22..4ef5bb47a 100755 --- a/debian/rules +++ b/debian/rules @@ -125,25 +125,8 @@ clean: debian/%.install: debian/%.install.in sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@ -binary-indep: libapt-common apt-doc libapt-pkg-doc +binary-indep: apt-doc libapt-pkg-doc # Build architecture-independent files here. -libapt-common: build - dh_testdir -p$@ - dh_testroot -p$@ - dh_prep -p$@ - 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_gencontrol -p$@ - dh_md5sums -p$@ - dh_builddeb -p$@ - libapt-pkg-doc: build-doc dh_testdir -p$@ dh_testroot -p$@ -- cgit v1.2.3-70-g09d2