From: Michael Vogt <mvo@debian.org>
Date: Tue, 22 Oct 2013 20:05:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress... 
X-Git-Tag: 0.9.13.exp1~11
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/51355387e5a5d4d7275a34b1c22f0ef5a76172d5?hp=--cc

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

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

51355387e5a5d4d7275a34b1c22f0ef5a76172d5
diff --cc apt-pkg/makefile
index 503bd7839,dc943aad4..a90131f80
--- a/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..