abi bump for gcc-5

* abi bump for gcc-5
* debian/control
  - rename libapt-pkg4.12 -> libapt-pkg4.16,
    the versions 4.13-4.15 are already taken in experimental
  - rename libapt-inst1.5 -> libapt-inst1.7,
    version 1.6 is already taken in experimental
  - build-depend on gcc-5 (>= 5.2.1-10) temporarily
* debian/rules:
    - build with -O2 everywhere because of
      https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66868

7 files changed, 25 insertions, 6 deletions

diff --git a/debian/changelog b/debian/changelog
index 2ae74b106..99595845e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+apt (1.0.9.10ubuntu2) wily; urgency=medium
+
+  * abi bump for gcc-5
+  * debian/control
+    - rename libapt-pkg4.12 -> libapt-pkg4.16,
+      the versions 4.13-4.15 are already taken in experimental
+    - rename libapt-inst1.5 -> libapt-inst1.7,
+      version 1.6 is already taken in experimental
+    - build-depend on gcc-5 (>= 5.2.1-10) temporarily
+  * debian/rules:
+    - build with -O2 everywhere because of
+      https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66868
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 17 Jul 2015 11:40:34 +0200
+
 apt (1.0.9.10ubuntu1) wily; urgency=low
 
   * merged from debian/sid
diff --git a/debian/control b/debian/control
index 299092543..813b3188d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: dpkg-dev (>= 1.15.8), debhelper (>= 8.1.3~), libdb-dev,
  gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.19.4~),
  zlib1g-dev, libbz2-dev, liblzma-dev,
  xsltproc, docbook-xsl, docbook-xml, po4a (>= 0.34-2),
- autotools-dev, autoconf, automake, libgtest-dev
+ autotools-dev, autoconf, automake, libgtest-dev, gcc-5 (>= 5.2.1-10)
 Build-Depends-Indep: doxygen, w3m, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
@@ -39,7 +39,7 @@ Description: commandline package manager
   * apt-config as an interface to the configuration settings
   * apt-key as an interface to manage authentication keys
 
-Package: libapt-pkg4.12
+Package: libapt-pkg4.16
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -62,7 +62,7 @@ Description: package management runtime library
     http, rsh as well as an interface to add more transports like
     https (apt-transport-https) and debtorrent (apt-transport-debtorrent).
 
-Package: libapt-inst1.5
+Package: libapt-inst1.7
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/libapt-inst1.5.install.in b/debian/libapt-inst1.7.install.in
index 8bcce2c28..8bcce2c28 100644
--- a/debian/libapt-inst1.5.install.in
+++ b/debian/libapt-inst1.7.install.in
diff --git a/debian/libapt-inst1.5.symbols b/debian/libapt-inst1.7.symbols
index 8ce707287..d52b36ee1 100644
--- a/debian/libapt-inst1.5.symbols
+++ b/debian/libapt-inst1.7.symbols
@@ -1,4 +1,4 @@
-libapt-inst.so.1.5 libapt-inst1.5 #MINVER#
+libapt-inst.so.1.7 libapt-inst1.7 #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.12.install.in b/debian/libapt-pkg4.16.install.in
index 56bed39d3..56bed39d3 100644
--- a/debian/libapt-pkg4.12.install.in
+++ b/debian/libapt-pkg4.16.install.in
diff --git a/debian/libapt-pkg4.12.symbols b/debian/libapt-pkg4.16.symbols
index d481e51ed..f11871c28 100644
--- a/debian/libapt-pkg4.12.symbols
+++ b/debian/libapt-pkg4.16.symbols
@@ -1,4 +1,4 @@
-libapt-pkg.so.4.12 libapt-pkg4.12 #MINVER#
+libapt-pkg.so.4.16 libapt-pkg4.16 #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 b2583b1ee..0101a303d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,11 @@ ifneq (,$(shell which dpkg-buildflags))
   # make does not export to $(shell) so we need to workaround 
   # (http://savannah.gnu.org/bugs/?10593)
   dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=hardening=+all dpkg-buildflags
-  export CXXFLAGS = $(shell $(dpkg_buildflags) --get CXXFLAGS)
+
+  # workaround gcc-5 compile error
+  # (see https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1473674)
+  export CXXFLAGS = $(subst -O3,-O2,$(shell $(dpkg_buildflags) --get CXXFLAGS))
+
   export LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS)
   export CPPFLAGS = $(shell $(dpkg_buildflags) --get CPPFLAGS)
 else