Просмотр исходного кода

* cmdline/cacheset.cc:
- doesn't include it in the library for now as it is too volatile

David Kalnischkies лет назад: 16
Родитель
Сommit
d8276801a1
5 измененных файлов с 6 добавлено и 6 удалено
  1. 2 3
      apt-pkg/makefile
  2. 0 0
      cmdline/cacheset.cc
  3. 0 0
      cmdline/cacheset.h
  4. 2 2
      cmdline/makefile
  5. 2 1
      debian/changelog

+ 2 - 3
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..

apt-pkg/cacheset.cc → cmdline/cacheset.cc


apt-pkg/cacheset.h → cmdline/cacheset.h


+ 2 - 2
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

+ 2 - 1
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: