merged libapt multiarch enable patch from Colin Watson, many thanks!

diff --git a/.bzrignore b/.bzrignore
index 7c4b11b10c5151cf674421f69786f638cf4db6b3..dab38cf712c8add75bc78d6f19be6d2b5b29417f 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -10,6 +10,8 @@ build/
 configure
 buildlib/config.sub
 buildlib/config.guess
 configure
 buildlib/config.sub
 buildlib/config.guess

+debian/libapt-pkg[0-9]*.install
+debian/libapt-inst[0-9]*.install

 
 # abichecker related files/dir
 abicheck/apt_build.xml
 
 # abichecker related files/dir
 abicheck/apt_build.xml

diff --git a/debian/changelog b/debian/changelog
index fab547fc82be73feffbea2c789dd5042789e1537..fa1bd7c47c6a6e1255be431f3151a1e835857b39 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
 apt (0.8.16~exp9) UNRELEASED; urgency=low
 
 apt (0.8.16~exp9) UNRELEASED; urgency=low
 

+  [ Julian Andres Klode ]

   * apt-pkg/cdrom.cc:
     - Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
 
   * apt-pkg/cdrom.cc:
     - Accept .bz2, .xz files in addition to .gz files (Closes: #649451)
 

+  [ Colin Watson ]
+  * Convert libapt-pkg4.12 and libapt-inst1.4 to Multi-Arch: same.
+  
+  [ Michael Vogt ]
+  * debian/control:
+    - bump debhelper build-dep to debhelper (>= 8.1.3~)
+    - set libapt-pkg-dev to multi-arch: same too
+

  -- Julian Andres Klode <jak@debian.org>  Mon, 21 Nov 2011 18:46:36 +0100
 
 apt (0.8.16~exp8) experimental; urgency=low
  -- Julian Andres Klode <jak@debian.org>  Mon, 21 Nov 2011 18:46:36 +0100
 
 apt (0.8.16~exp8) experimental; urgency=low

diff --git a/debian/control b/debian/control
index 7efb6ca8ab980ffa982655b5342f071b4657f54c..24c429ad42918964b0359ce3509db28c1b2393d0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
  Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.9.2
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
  Julian Andres Klode <jak@debian.org>
 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
  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
 
   * 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
 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.
 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
 
 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
 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
 
 Package: libapt-pkg-dev
 Architecture: any

+Multi-Arch: same

 Priority: optional
 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
 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

diff --git a/debian/libapt-inst1.4.install b/debian/libapt-inst1.4.install
index b7b63be81fcccb02836b47ffae3579bed5c616dd..b81d15c10370f3a83fd8ec6ef4c5bedc44099feb 100644 (file)
--- a/debian/libapt-inst1.4.install
+++ b/debian/libapt-inst1.4.install
@@ -1,2 +1 @@
-bin/libapt-inst*.so.* usr/lib/
-usr/share/locale/*/*/libapt-inst*.mo
+bin/libapt-inst*.so.* usr/lib/@DEB_HOST_MULTIARCH@/

diff --git a/debian/libapt-pkg-dev.dirs b/debian/libapt-pkg-dev.dirs
deleted file mode 100644 (file)
index 844642a..0000000
--- a/debian/libapt-pkg-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include/apt-pkg

diff --git a/debian/libapt-pkg-dev.install b/debian/libapt-pkg-dev.install
index bd1a6c1743ca25c14757d8e8b0bdfc1a2709cfe9..be8022107e2c575ced16e788804ce7a157e0a042 100644 (file)
--- a/debian/libapt-pkg-dev.install
+++ b/debian/libapt-pkg-dev.install
@@ -1,3 +1,3 @@
-bin/libapt-pkg*.so usr/lib/
-bin/libapt-inst*.so usr/lib/
+bin/libapt-pkg*.so usr/lib/@DEB_HOST_MULTIARCH@/
+bin/libapt-inst*.so usr/lib/@DEB_HOST_MULTIARCH@/

 include/apt-pkg/*.h usr/include/apt-pkg/
 include/apt-pkg/*.h usr/include/apt-pkg/

diff --git a/debian/libapt-pkg4.12.install b/debian/libapt-pkg4.12.install
index 91b39a31bbe5fb5f41254b3187e05ccce73d7b9f..0db4075fa3bfb82ea004b1243a4fad3b8b2ce4c5 100644 (file)
--- a/debian/libapt-pkg4.12.install
+++ b/debian/libapt-pkg4.12.install
@@ -1,2 +1 @@
-bin/libapt-pkg*.so.* usr/lib/
-usr/share/locale/*/*/libapt-pkg*.mo
+bin/libapt-pkg*.so.* usr/lib/@DEB_HOST_MULTIARCH@/

diff --git a/debian/rules b/debian/rules
index 30474c06b71fb4cd9ac6adbd7a70a45119e97e52..6a5c95d22c7c4286bb526d778f04dd8d7a09a185 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)

+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 
 # FOR AUTOCONF 2.52 AND NEWER ONLY
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))


@@ -118,9 +119,31 @@ clean:
 
        [ ! -f Makefile ] || $(MAKE) clean distclean
        rm -rf build
 
        [ ! -f Makefile ] || $(MAKE) clean distclean
        rm -rf build

+       rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \
+             debian/libapt-pkg-dev.install

 
 

-binary-indep: apt-doc libapt-pkg-doc
+debian/%.install: debian/%.install.in
+       sed 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $< > $@
+
+binary-indep: libapt-common apt-doc libapt-pkg-doc

 # Build architecture-independent files here.
 # 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$@
 libapt-pkg-doc: build-doc
        dh_testdir -p$@
        dh_testroot -p$@


@@ -217,7 +240,7 @@ apt: build build-doc
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-libapt-pkg-dev: build
+libapt-pkg-dev: build debian/libapt-pkg-dev.install

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@


@@ -265,7 +288,7 @@ apt-utils: build
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-$(LIBAPT_PKG): build
+$(LIBAPT_PKG): build debian/$(LIBAPT_PKG).install

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@


@@ -284,7 +307,7 @@ $(LIBAPT_PKG): build
        dh_md5sums -p$@
        dh_builddeb -p$@
 
        dh_md5sums -p$@
        dh_builddeb -p$@
 

-$(LIBAPT_INST): build
+$(LIBAPT_INST): build debian/$(LIBAPT_INST).install

        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@
        dh_testdir -p$@
        dh_testroot -p$@
        dh_prep -p$@