From 5c0d3668dd2b6852812502f33d64b1644c2b137a Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Jan 2010 22:19:57 +0100
Subject: * apt-pkg/contrib/macros.h:   - move the header system.h with a new
 name to the public domain,     to be able to use it in other headers (Closes:
 #567662)

---
 apt-inst/contrib/extracttar.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-inst')

diff --git a/apt-inst/contrib/extracttar.cc b/apt-inst/contrib/extracttar.cc
index 8338fd89d..3d2788aaf 100644
--- a/apt-inst/contrib/extracttar.cc
+++ b/apt-inst/contrib/extracttar.cc
@@ -21,7 +21,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/configuration.h>
-#include <system.h>
+#include <apt-pkg/macros.h>
 
 #include <stdlib.h>
 #include <unistd.h>
-- 
cgit v1.2.3


From 44c8b5dff8871485d071f92cd154dc1c14c3c015 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Thu, 18 Feb 2010 01:37:59 +0100
Subject: we break the ABI, so let use increase the ABI number :) (This is the
 revert of the glibc-abi-compatibility-hack)

---
 apt-inst/makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-inst')

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)
-- 
cgit v1.2.3


From d59a67ff100ef7006376a14ceef833a460c2f404 Mon Sep 17 00:00:00 2001
From: Julian Andres Klode <jak@debian.org>
Date: Fri, 12 Mar 2010 15:28:24 +0100
Subject: apt-inst/contrib/arfile.h: Add public ARArchive::Members() which
 returns the list of members.

---
 apt-inst/contrib/arfile.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'apt-inst')

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();
-- 
cgit v1.2.3


From ea4b220b1b17b270fc1a05e454439c32589548b7 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Fri, 4 Jun 2010 14:51:21 +0200
Subject: Switch away from the now deprecated methods for Cache building

---
 apt-inst/deb/dpkgdb.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'apt-inst')

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();
    
-- 
cgit v1.2.3