From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Tue, 22 Nov 2011 12:42:49 +0000 (+0100)
Subject: merged lp:~mvo/apt/convert-to-multiarch-lib-thanks-colin
X-Git-Tag: 0.9.13.exp1ubuntu1~118
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/905693203943283b3c2b1dbf32e40a738392302a?ds=inline

merged lp:~mvo/apt/convert-to-multiarch-lib-thanks-colin
---

905693203943283b3c2b1dbf32e40a738392302a
diff --cc debian/changelog
index d34052343,fa1bd7c47..ac1eb16e6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,19 +1,28 @@@
- apt (0.8.16~exp8ubuntu1) UNRELEASED; urgency=low
++apt (0.8.16~exp9ubuntu1) UNRELEASED; urgency=low
 +
 +  * merge from debian/experimental:
 +    - new ABI
 +    - header reshuffling that may cause FTBFS
 +  * DO NOT UPLOAD YET; THERE IS ANOTHER ABI BREAK COMMING SOON
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Nov 2011 16:51:36 +0100
 +
+ 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)
+ 
+   [ 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
  
    [ David Kalnischkies ]
diff --cc debian/control
index 150c56829,24c429ad4..28d9dd839
--- a/debian/control
+++ b/debian/control
@@@ -7,14 -6,13 +7,14 @@@ Uploaders: Michael Vogt <mvo@debian.org
   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
 + po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen,
 + gcc-4.6 (>= 4.6.0-6ubuntu2)
  Build-Conflicts: autoconf2.13, automake1.4
 -Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 -Vcs-Browser: http://bzr.debian.org/loggerhead/apt/debian-sid/
 +Vcs-Bzr: lp:~ubuntu-core-dev/apt/ubuntu
 +Vcs-Browser: http://code.launchpad.net/apt/ubuntu
  
  Package: apt
  Architecture: any
diff --cc debian/rules
index 71019a746,6a5c95d22..ce9c7e6cc
--- a/debian/rules
+++ b/debian/rules
@@@ -3,11 -3,9 +3,12 @@@
  # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
  # Some lines taken from debmake, by Christoph Lameter.
  
 +# build in verbose mode by default to make it easy to diangose issues
 +export NOISY=1
 +
  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))