updated for the gcc5 transition

16 files changed, 39 insertions, 10 deletions

diff --git a/apt-inst/makefile b/apt-inst/makefile
index af887bba8..2d29206fd 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -14,7 +14,7 @@ include ../buildlib/libversion.mak
 
 # The library name
 LIBRARY=apt-inst
-MAJOR=1.5
+MAJOR=1.7
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)
diff --git a/apt-pkg/cacheset.cc b/apt-pkg/cacheset.cc
index 2ed6a96da..74837dcb9 100644
--- a/apt-pkg/cacheset.cc
+++ b/apt-pkg/cacheset.cc
@@ -321,7 +321,7 @@ bool PackageContainerInterface::FromString(PackageContainerInterface * const pci
 	if (FromGroup(pci, Cache, str, helper) == false &&
 		 FromTask(pci, Cache, str, helper) == false &&
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
-		 FromFnmatch(pci, Cache, str, helper) == false)
+		 FromFnmatch(pci, Cache, str, helper) == false &&
 #endif
 		 FromRegEx(pci, Cache, str, helper) == false)
 	{
diff --git a/apt-pkg/contrib/configuration.h b/apt-pkg/contrib/configuration.h
index c256139f4..fde9cf851 100644
--- a/apt-pkg/contrib/configuration.h
+++ b/apt-pkg/contrib/configuration.h
@@ -33,6 +33,7 @@
 #include <string>
 #include <vector>
 #include <iostream>
+#include <apt-pkg/macros.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 using std::string;
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index 2d6448e5e..b9ec161af 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -138,7 +138,7 @@
 // Non-ABI-Breaks should only increase RELEASE number.
 // See also buildlib/libversion.mak
 #define APT_PKG_MAJOR 4
-#define APT_PKG_MINOR 12
+#define APT_PKG_MINOR 16
 #define APT_PKG_RELEASE 0
 
 #endif
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index 82e045fd3..d17734fdc 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -1068,6 +1068,17 @@ bool pkgDPkgPM::Go(int StatusFd)
    
    return GoNoABIBreak(progress);
 }
+#else
+bool pkgDPkgPM::Go(int StatusFd)
+{
+   APT::Progress::PackageManager *progress = NULL;
+   if (StatusFd == -1)
+      progress = APT::Progress::PackageManagerProgressFactory();
+   else
+      progress = new APT::Progress::PackageManagerProgressFd(StatusFd);
+   
+   return Go(progress);
+}
 #endif
 
 void pkgDPkgPM::StartPtyMagic()
diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 2c1805015..e60f5fc3b 100644
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -135,6 +135,8 @@ class pkgDPkgPM : public pkgPackageManager
 
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager *progress);
+   // compat
+   virtual bool Go(int StatusFd=-1);
 #else
    virtual bool Go(int StatusFd=-1);
    bool GoNoABIBreak(APT::Progress::PackageManager *progress);
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 249542c68..4226a3686 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -28,7 +28,8 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 #include <apt-pkg/strutl.h>
-
+#include <apt-pkg/install-progress.h>
+ 
 #include <stddef.h>
 #include <list>
 #include <string>
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index d72790b6e..34b4b529f 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -45,6 +45,12 @@ class pkgSourceList;
 class pkgOrderList;
 class pkgRecords;
 
+namespace APT {
+   namespace Progress {
+      class PackageManager;
+      class PackageManagerProgressFd;
+   }
+}
 
 class pkgPackageManager : protected pkgCache::Namespace
 {
@@ -93,6 +99,8 @@ class pkgPackageManager : protected pkgCache::Namespace
    virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager * /*progress*/) {return true;};
+   // compat
+   virtual bool Go(int /*statusFd*/=-1) {return true;};
 #else
    virtual bool Go(int /*statusFd*/=-1) {return true;};
 #endif
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index e08cd8057..4e201c60b 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -20,6 +20,7 @@
 #include <apt-pkg/packagemanager.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/upgrade.h>
+#include <apt-pkg/install-progress.h>
 
 #include <errno.h>
 #include <stdlib.h>
diff --git a/apt-private/private-update.cc b/apt-private/private-update.cc
index 1cf3012ed..b00bab735 100644
--- a/apt-private/private-update.cc
+++ b/apt-private/private-update.cc
@@ -10,6 +10,7 @@
 #include <apt-pkg/update.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/install-progress.h>
 
 #include <apt-private/acqprogress.h>
 #include <apt-private/private-cachefile.h>
diff --git a/debian/control b/debian/control
index 0437aa737..eaefc1d31 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,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, 
 Build-Depends-Indep: doxygen, w3m, graphviz
 Build-Conflicts: autoconf2.13, automake1.4
 Vcs-Git: git://anonscm.debian.org/apt/apt.git
@@ -38,7 +38,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}
@@ -61,7 +61,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 f031cfddb..8805ab870 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