Browse Source

* apt-pkg/cacheset.cc:

- move them back to the library as they look stable now
tags/debian/0.8.0
David Kalnischkies 11 years ago
parent
commit
8fde723961
7 changed files with 10 additions and 10 deletions
  1. +1
    -2
      apt-pkg/cacheset.cc
  2. +0
    -0
      apt-pkg/cacheset.h
  3. +2
    -2
      apt-pkg/makefile
  4. +1
    -2
      cmdline/apt-cache.cc
  5. +1
    -1
      cmdline/apt-get.cc
  6. +2
    -2
      cmdline/makefile
  7. +3
    -1
      debian/changelog

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

@@ -11,14 +11,13 @@
// Include Files /*{{{*/
#include <apt-pkg/aptconfiguration.h>
#include <apt-pkg/cachefilter.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/error.h>
#include <apt-pkg/strutl.h>
#include <apt-pkg/versionmatch.h>

#include <apti18n.h>

#include "cacheset.h"

#include <vector>

#include <regex.h>

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


+ 2
- 2
apt-pkg/makefile View File

@@ -35,7 +35,7 @@ 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 cachefilter.cc
aptconfiguration.cc cachefilter.cc cacheset.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 \
@@ -43,7 +43,7 @@ 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
cachefilter.h cacheset.h

# Source code for the debian specific components
# In theory the deb headers do not need to be exported..


+ 1
- 2
cmdline/apt-cache.cc View File

@@ -17,6 +17,7 @@
#include <cassert>
#include <apt-pkg/pkgcachegen.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/init.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/sourcelist.h>
@@ -30,8 +31,6 @@
#include <apt-pkg/algorithms.h>
#include <apt-pkg/sptr.h>

#include "cacheset.h"

#include <config.h>
#include <apti18n.h>



+ 1
- 1
cmdline/apt-get.cc View File

@@ -37,6 +37,7 @@
#include <apt-pkg/srcrecords.h>
#include <apt-pkg/version.h>
#include <apt-pkg/cachefile.h>
#include <apt-pkg/cacheset.h>
#include <apt-pkg/sptr.h>
#include <apt-pkg/md5.h>
#include <apt-pkg/versionmatch.h>
@@ -45,7 +46,6 @@
#include <apti18n.h>

#include "acqprogress.h"
#include "cacheset.h"

#include <set>
#include <locale.h>


+ 2
- 2
cmdline/makefile View File

@@ -9,14 +9,14 @@ include ../buildlib/defaults.mak
PROGRAM=apt-cache
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-cache.cc cacheset.cc
SOURCE = apt-cache.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 cacheset.cc
SOURCE = apt-get.cc acqprogress.cc
include $(PROGRAM_H)

# The apt-config program


+ 3
- 1
debian/changelog View File

@@ -5,8 +5,10 @@ apt (0.7.26~exp11) experimental; urgency=low
- handle "circular" conflicts for "all" packages correctly
* cmdline/apt-cache.cc:
- be able to omit dependency types in (r)depends (Closes: #319006)
* apt-pkg/cacheset.cc:
- move them back to the library as they look stable now

-- David Kalnischkies <kalnischkies@gmail.com> Wed, 14 Jul 2010 22:58:08 +0200
-- David Kalnischkies <kalnischkies@gmail.com> Sat, 17 Jul 2010 19:56:47 +0200

apt (0.7.26~exp10) experimental; urgency=low



Loading…
Cancel
Save