Merge branch 'pu/abi6'

7 files changed, 8 insertions, 11 deletions

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index a788ec98b..6cf200f5b 100644
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -33,7 +33,7 @@
 // ---------------------------------------------------------------------
 /* */
 AcqTextStatus::AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsigned int const Quiet) :
-    pkgAcquireStatus2(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet)
+    pkgAcquireStatus(), out(out), ScreenWidth(ScreenWidth), LastLineLength(0), ID(0), Quiet(Quiet)
 {
    // testcases use it to disable pulses without disabling other user messages
    if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
@@ -335,10 +335,10 @@ bool AcqTextStatus::ReleaseInfoChanges(metaIndex const * const L, metaIndex cons
 {
    if (Quiet >= 2 || isatty(STDOUT_FILENO) != 1 || isatty(STDIN_FILENO) != 1 ||
 	 _config->FindB("APT::Get::Update::InteractiveReleaseInfoChanges", false) == false)
-      return pkgAcquireStatus2::ReleaseInfoChanges(nullptr, nullptr, std::move(Changes));
+      return pkgAcquireStatus::ReleaseInfoChanges(nullptr, nullptr, std::move(Changes));
 
    _error->PushToStack();
-   auto const confirmed = pkgAcquireStatus2::ReleaseInfoChanges(L, N, std::move(Changes));
+   auto const confirmed = pkgAcquireStatus::ReleaseInfoChanges(L, N, std::move(Changes));
    if (confirmed == true)
    {
       _error->MergeWithStack();
diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index c8c211689..87b957e4b 100644
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -15,7 +15,7 @@
 #include <iostream>
 #include <string>
 
-class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus2
+class APT_PUBLIC AcqTextStatus : public pkgAcquireStatus
 {
    std::ostream &out;
    unsigned int &ScreenWidth;
diff --git a/apt-private/private-download.cc b/apt-private/private-download.cc
index 2c12676ea..16d11255b 100644
--- a/apt-private/private-download.cc
+++ b/apt-private/private-download.cc
@@ -339,7 +339,7 @@ bool DoClean(CommandLine &)
 // ---------------------------------------------------------------------
 /* This is similar to clean but it only purges things that cannot be 
    downloaded, that is old versions of cached packages. */
- class LogCleaner : public pkgArchiveCleaner2
+ class LogCleaner : public pkgArchiveCleaner
 {
    protected:
       virtual void Erase(int const dirfd, char const * const File, std::string const &Pkg, std::string const &Ver,struct stat const &St) APT_OVERRIDE
diff --git a/apt-private/private-install.cc b/apt-private/private-install.cc
index 40543d995..a5a88c99d 100644
--- a/apt-private/private-install.cc
+++ b/apt-private/private-install.cc
@@ -18,7 +18,6 @@
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/prettyprinters.h>
-#include <apt-pkg/sptr.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/upgrade.h>
 
diff --git a/apt-private/private-main.cc b/apt-private/private-main.cc
index 47b1a0921..e9f65bd83 100644
--- a/apt-private/private-main.cc
+++ b/apt-private/private-main.cc
@@ -44,7 +44,6 @@ void InitLocale(APT_CMD const binary)				/*{{{*/
 	 break;
    }
 }
-void InitLocale() {}
 									/*}}}*/
 void InitSignals()							/*{{{*/
 {
diff --git a/apt-private/private-main.h b/apt-private/private-main.h
index 0d60797ed..4dcb2716a 100644
--- a/apt-private/private-main.h
+++ b/apt-private/private-main.h
@@ -8,7 +8,6 @@
 class CommandLine;
 
 void InitLocale(APT_CMD const binary);
-APT_PUBLIC APT_DEPRECATED_MSG("Is a no-op now") void InitLocale();
 APT_PUBLIC void InitSignals();
 APT_PUBLIC void CheckIfSimulateMode(CommandLine &CmdL);
 APT_PUBLIC void CheckIfCalledByScript(int argc, const char *argv[]);
diff --git a/apt-private/private-source.cc b/apt-private/private-source.cc
index c8a48a74a..48c9d8094 100644
--- a/apt-private/private-source.cc
+++ b/apt-private/private-source.cc
@@ -383,14 +383,14 @@ bool DoSource(CommandLine &CmdL)
       }
 
       // Back track
-      std::vector<pkgSrcRecords::File2> Lst;
-      if (Last->Files2(Lst) == false) {
+      std::vector<pkgSrcRecords::File> Lst;
+      if (Last->Files(Lst) == false) {
 	 return false;
       }
 
       DscFile curDsc;
       // Load them into the fetcher
-      for (std::vector<pkgSrcRecords::File2>::const_iterator I = Lst.begin();
+      for (std::vector<pkgSrcRecords::File>::const_iterator I = Lst.begin();
 	    I != Lst.end(); ++I)
       {
 	 // Try to guess what sort of file it is we are getting.