summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-10-21 21:23:07 +0200
committerMichael Vogt <mvo@debian.org>2013-10-21 21:23:34 +0200
commit1c6cedc489b5eaeed1b7fdb845eca06bc1fccd4f (patch)
tree9022a2cb7fb65f738be8eaf1574f06a56faa9d01
parent65dbd5a1a32f63dae81c8b5814cd246f1154c38d (diff)
downloadapt-1c6cedc489b5eaeed1b7fdb845eca06bc1fccd4f.tar.gz
move iprogress.{cc,h} to private-progress.{cc,h} until its fully stable
-rw-r--r--apt-pkg/makefile4
-rw-r--r--apt-private/makefile2
-rw-r--r--apt-private/private-progress.cc (renamed from apt-pkg/iprogress.cc)0
-rw-r--r--apt-private/private-progress.h (renamed from apt-pkg/iprogress.h)0
4 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/makefile b/apt-pkg/makefile
index e69b5ce7f..abf701511 100644
--- a/apt-pkg/makefile
+++ b/apt-pkg/makefile
@@ -43,7 +43,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 cacheset.cc edsp.cc iprogress.cc
+ aptconfiguration.cc cachefilter.cc cacheset.cc edsp.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 \
@@ -51,7 +51,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 cacheset.h edsp.h iprogress.h
+ cachefilter.h cacheset.h edsp.h
# Source code for the debian specific components
# In theory the deb headers do not need to be exported..
diff --git a/apt-private/makefile b/apt-private/makefile
index 1d179f0b2..9b074f189 100644
--- a/apt-private/makefile
+++ b/apt-private/makefile
@@ -17,7 +17,7 @@ MAJOR=0.0
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
-PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main
+PRIVATES=list install download output cachefile cacheset update upgrade cmndline moo search show main progress
SOURCE += $(foreach private, $(PRIVATES), private-$(private).cc)
HEADERS += $(foreach private, $(PRIVATES), private-$(private).h)
diff --git a/apt-pkg/iprogress.cc b/apt-private/private-progress.cc
index daa7695e2..daa7695e2 100644
--- a/apt-pkg/iprogress.cc
+++ b/apt-private/private-progress.cc
diff --git a/apt-pkg/iprogress.h b/apt-private/private-progress.h
index 42fa89be4..42fa89be4 100644
--- a/apt-pkg/iprogress.h
+++ b/apt-private/private-progress.h