summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-pkg/makefile5
-rw-r--r--cmdline/cacheset.cc (renamed from apt-pkg/cacheset.cc)0
-rw-r--r--cmdline/cacheset.h (renamed from apt-pkg/cacheset.h)0
-rw-r--r--cmdline/makefile4
-rw-r--r--debian/changelog3
5 files changed, 6 insertions, 6 deletions
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index 1a7078693..a5be462ce 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -35,15 +35,14 @@ SOURCE+= pkgcache.cc version.cc depcache.cc \
srcrecords.cc cachefile.cc versionmatch.cc policy.cc \
pkgsystem.cc indexfile.cc pkgcachegen.cc acquire-item.cc \
indexrecords.cc vendor.cc vendorlist.cc cdrom.cc indexcopy.cc \
- aptconfiguration.cc cacheset.cc
+ aptconfiguration.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 \
acquire.h acquire-worker.h acquire-item.h acquire-method.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 \
- cacheset.h
+ vendorlist.h cdrom.h indexcopy.h aptconfiguration.h
# Source code for the debian specific components
# In theory the deb headers do not need to be exported..
diff --git a/apt-pkg/cacheset.cc b/cmdline/cacheset.cc
index fde52168a..fde52168a 100644
--- a/apt-pkg/cacheset.cc
+++ b/cmdline/cacheset.cc
diff --git a/apt-pkg/cacheset.h b/cmdline/cacheset.h
index 2bc268380..2bc268380 100644
--- a/apt-pkg/cacheset.h
+++ b/cmdline/cacheset.h
diff --git a/cmdline/makefile b/cmdline/makefile
index 917ccc96a..4ffe49ee0 100644
--- a/cmdline/makefile
+++ b/cmdline/makefile
@@ -9,14 +9,14 @@ include ../buildlib/defaults.mak
PROGRAM=apt-cache
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-cache.cc
+SOURCE = apt-cache.cc cacheset.cc
include $(PROGRAM_H)
# The apt-get program
PROGRAM=apt-get
SLIBS = -lapt-pkg -lutil $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
-SOURCE = apt-get.cc acqprogress.cc
+SOURCE = apt-get.cc acqprogress.cc cacheset.cc
include $(PROGRAM_H)
# The apt-config program
diff --git a/debian/changelog b/debian/changelog
index f2a18d397..2648730ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
apt (0.7.26~exp8) UNRELEASED; urgency=low
- * apt-pkg/cacheset.cc:
+ * cmdline/cacheset.cc:
+ - doesn't include it in the library for now as it is too volatile
- get the candidate either from an already built depcache
or use the policy which is a bit faster than depcache generation
* apt-pkg/orderlist.cc: