Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress...

Conflicts:
	apt-pkg/deb/dpkgpm.cc
	apt-pkg/makefile

diff --combined apt-pkg/makefile
index 503bd783902bf3fe5d0562a66d0db9df954a9d97,dc943aad47e560a462355c36ec6be82992e40635..a90131f80f58ce14f35640177be6cb7a7eddf3b7
--- 1/apt-pkg/makefile
--- 2/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@@ -44,7 -44,7 +44,7 @@@ SOURCE+= pkgcache.cc version.cc depcach
         pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
         indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \
         aptconfiguration.cc cachefilter.cc cacheset.cc edsp.cc \
-        install-progress.cc
 -       upgrade.cc update.cc
++       install-progress.cc upgrade.cc update.cc
  HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \
          orderlist.h sourcelist.h packagemanager.h tagfile.h \
          init.h pkgcache.h version.h progress.h pkgrecords.h \
@@@ -52,7 -52,7 +52,8 @@@
          clean.h srcrecords.h cachefile.h versionmatch.h policy.h \
          pkgsystem.h indexfile.h metaindex.h indexrecords.h vendor.h \
          vendorlist.h cdrom.h indexcopy.h aptconfiguration.h \
-         cachefilter.h cacheset.h edsp.h install-progress.h
 -        cachefilter.h cacheset.h edsp.h upgrade.h update.h
++        cachefilter.h cacheset.h edsp.h install-progress.h \
++        upgrade.h update.h
  
  # Source code for the debian specific components
  # In theory the deb headers do not need to be exported..