summaryrefslogtreecommitdiff
path: root/apt-inst
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-07-30 19:29:44 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-07-30 19:29:44 +0200
commita521ca5d3fc6619529843779ea46500fa6e69e14 (patch)
treed6134e25dad5550e75768f8c9fbaabe75d81e541 /apt-inst
parent34904390bd6901f3de90249938baa0b875873534 (diff)
parent7abfcfbe8518d1b5cc79e967c3ac16c2f783d6ea (diff)
merged from experimental-apt-for-ubuntu
Diffstat (limited to 'apt-inst')
-rw-r--r--apt-inst/contrib/arfile.h1
-rw-r--r--apt-inst/deb/dpkgdb.cc2
-rw-r--r--apt-inst/makefile2
3 files changed, 3 insertions, 2 deletions
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index 96e18bc60..7f6c68302 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -39,6 +39,7 @@ class ARArchive
// Locate a member by name
const Member *FindMember(const char *Name) const;
+ inline Member *Members() { return List; }
ARArchive(FileFd &File);
~ARArchive();
diff --git a/apt-inst/deb/dpkgdb.cc b/apt-inst/deb/dpkgdb.cc
index e51e4f8b3..a75cf59ca 100644
--- a/apt-inst/deb/dpkgdb.cc
+++ b/apt-inst/deb/dpkgdb.cc
@@ -142,7 +142,7 @@ bool debDpkgDB::ReadyPkgCache(OpProgress &Progress)
CacheMap = 0;
}
- if (pkgMakeOnlyStatusCache(Progress,&CacheMap) == false)
+ if (pkgCacheGenerator::MakeOnlyStatusCache(&Progress,&CacheMap) == false)
return false;
Cache->DropProgress();
diff --git a/apt-inst/makefile b/apt-inst/makefile
index abc8c3fd9..785dc62ba 100644
--- a/apt-inst/makefile
+++ b/apt-inst/makefile
@@ -14,7 +14,7 @@ include ../buildlib/libversion.mak
# The library name
LIBRARY=apt-inst
-MAJOR=1.1
+MAJOR=1.2
MINOR=0
SLIBS=$(PTHREADLIB) -lapt-pkg
APT_DOMAIN:=libapt-inst$(MAJOR)