From d88b70b8e73e9bee5d72a69539b4b9be7ba34814 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@ubuntu.com>
Date: Mon, 20 Jul 2015 15:48:25 +0200
Subject: fix build errors

---
 apt-pkg/cacheset.cc              | 2 +-
 apt-pkg/contrib/configuration.cc | 4 +++-
 apt-pkg/contrib/configuration.h  | 1 +
 apt-pkg/packagemanager.cc        | 1 +
 apt-pkg/packagemanager.h         | 6 ++++++
 apt-private/private-install.cc   | 1 +
 apt-private/private-update.cc    | 1 +
 debian/changelog                 | 2 +-
 8 files changed, 15 insertions(+), 3 deletions(-)

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.cc b/apt-pkg/contrib/configuration.cc
index 00f6ad0f9..928c213bb 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -254,7 +254,9 @@ string Configuration::FindDir(const char *Name,const char *Default) const
 // ---------------------------------------------------------------------
 /* Returns a vector of config values under the given item */
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
-vector<string> Configuration::FindVector(const char *Name) const { return FindVector(Name, ""); }
+vector<string> Configuration::FindVector(const char *Name) const {
+   return FindVector(Name, "");
+}
 #endif
 vector<string> Configuration::FindVector(const char *Name, std::string const &Default) const
 {
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/packagemanager.cc b/apt-pkg/packagemanager.cc
index 249542c68..e4cd1dc3b 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -28,6 +28,7 @@
 #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>
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index d72790b6e..96fbbbaea 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
 {
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/changelog b/debian/changelog
index 99595845e..2f111ac7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (1.0.9.10ubuntu2) wily; urgency=medium
+apt (1.0.9.10ubuntu4) wily; urgency=medium
 
   * abi bump for gcc-5
   * debian/control
-- 
cgit v1.2.3