fix some more ABI issues, abicheck is happy now

diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test
index 9ee840ea01d16ae20806b4277772f5a02fcc602e..8f2d7d203143da54d820be0b1407af76f20de002 100755 (executable)
--- a/abicheck/run_abi_test
+++ b/abicheck/run_abi_test
@@ -16,4 +16,4 @@ sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml
 BUILDPATH=$(readlink -f ../build)
 sed s#@build_path@#$BUILDPATH# apt_build.xml.in > apt_build.xml
 
 BUILDPATH=$(readlink -f ../build)
 sed s#@build_path@#$BUILDPATH# apt_build.xml.in > apt_build.xml
 

-abi-compliance-checker -l apt -d1 apt_installed.xml -d2 apt_build.xml
+abi-compliance-checker -l apt -d1 apt_installed.xml -d2 apt_build.xml $@

diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h
index 4494bbae3290d87daed4b7cde5c5674a0257cda7..50b5d609b36124eb5b7ac38d52c37d0ae9000aac 100644 (file)
--- a/apt-pkg/deb/dpkgpm.h
+++ b/apt-pkg/deb/dpkgpm.h
@@ -107,6 +107,15 @@ class pkgDPkgPM : public pkgPackageManager
    void DoTerminalPty(int master);
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);
    void DoTerminalPty(int master);
    void DoDpkgStatusFd(int statusfd);
    void ProcessDpkgStatusLine(char *line);

+#if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR < 13)
+   void DoDpkgStatusFd(int statusfd, int unused) {
+      DoDpkgStatusFd(statusfd);
+   }
+   void ProcessDpkgStatusLine(int unused, char *line) {
+      ProcessDpkgStatusLine(line);
+   }
+#endif
+

 
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,std::string File);
 
    // The Actuall installation implementation
    virtual bool Install(PkgIterator Pkg,std::string File);

diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index a5c58e4a7e46702c55aeec71805903d9d8bc93d8..853b9bac8c9f9b0878d7285ae3bb143eb3c37470 100644 (file)
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -91,7 +91,7 @@ class pkgPackageManager : protected pkgCache::Namespace
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager *progress) {return true;};
 #else
 #if (APT_PKG_MAJOR >= 4 && APT_PKG_MINOR >= 13)
    virtual bool Go(APT::Progress::PackageManager *progress) {return true;};
 #else

-   virtual bool Go(int StatusFd=-1) {return true;};
+   virtual bool Go(int statusFd=-1) {return true;};

 #endif
 
    virtual void Reset() {};
 #endif
 
    virtual void Reset() {};