diff options
author | Michael Vogt <mvo@debian.org> | 2013-10-22 22:05:15 +0200 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2013-10-22 22:06:24 +0200 |
commit | 51355387e5a5d4d7275a34b1c22f0ef5a76172d5 (patch) | |
tree | e40c80a0d5268eb42cf71461e5ef9494658e1b7d /apt-pkg/makefile | |
parent | b4017ba767e15dc06c73915efaf36409ee099bf2 (diff) | |
parent | 4b9969da40ff1dff2f5787feff5103c873c57f7f (diff) |
Merge remote-tracking branch 'upstream/debian/sid' into feature/install-progress-refactor
Conflicts:
apt-pkg/deb/dpkgpm.cc
apt-pkg/makefile
Diffstat (limited to 'apt-pkg/makefile')
-rw-r--r-- | apt-pkg/makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apt-pkg/makefile b/apt-pkg/makefile index 503bd7839..a90131f80 100644 --- a/apt-pkg/makefile +++ b/apt-pkg/makefile @@ -44,7 +44,7 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \ 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 + 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,8 @@ HEADERS+= algorithms.h depcache.h pkgcachegen.h cacheiterators.h \ 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 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.. |