From: David Kalnischkies <kalnischkies@gmail.com>
Date: Wed, 16 Mar 2011 20:26:54 +0000 (+0100)
Subject: * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc:
X-Git-Tag: 0.8.13.2~1^2~17
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/82b6682ac686fa07b02622aa4746b67eccb77e61?hp=6f31b247bae228250899b62b9dab6b13dc4ff170

* apt-pkg/vendor.cc, apt-pkg/vendorlist.cc:
  - mark them as deprecated as they are unused
---

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2ecb8ed6e..cf88ded7b 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -17,7 +17,6 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/sourcelist.h>
-#include <apt-pkg/vendorlist.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/fileutl.h>
@@ -1390,29 +1389,6 @@ void pkgAcqMetaIndex::QueueIndexes(bool verify)				/*{{{*/
 									/*}}}*/
 bool pkgAcqMetaIndex::VerifyVendor(string Message)			/*{{{*/
 {
-//    // Maybe this should be made available from above so we don't have
-//    // to read and parse it every time?
-//    pkgVendorList List;
-//    List.ReadMainList();
-
-//    const Vendor* Vndr = NULL;
-//    for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
-//    {
-//       string::size_type pos = (*I).find("VALIDSIG ");
-//       if (_config->FindB("Debug::Vendor", false))
-//          std::cerr << "Looking for VALIDSIG in \"" << (*I) << "\": pos " << pos 
-//                    << std::endl;
-//       if (pos != std::string::npos)
-//       {
-//          string Fingerprint = (*I).substr(pos+sizeof("VALIDSIG"));
-//          if (_config->FindB("Debug::Vendor", false))
-//             std::cerr << "Looking for \"" << Fingerprint << "\" in vendor..." <<
-//                std::endl;
-//          Vndr = List.FindVendor(Fingerprint) != "";
-//          if (Vndr != NULL);
-//          break;
-//       }
-//    }
    string::size_type pos;
 
    // check for missing sigs (that where not fatal because otherwise we had
diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index 2d39fd15f..df229737a 100644
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -4,11 +4,12 @@
 #include <vector>
 #include <map>
 
+#include <apt-pkg/macros.h>
 
 using std::string;
 
 // A class representing a particular software provider. 
-class Vendor
+class __deprecated Vendor
 {
    public:
    struct Fingerprint
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 92ff38894..48ac12cee 100644
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,8 +1,13 @@
-#include <apt-pkg/vendorlist.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apti18n.h>
 
+#if __GNUC__ >= 4
+	#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#include <apt-pkg/vendorlist.h>
+
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
@@ -143,3 +148,7 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)	/*
    return NULL;
 }
 									/*}}}*/
+
+#if __GNUC__ >= 4
+	#pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif
diff --git a/apt-pkg/vendorlist.h b/apt-pkg/vendorlist.h
index ff2f4ed5d..eaeecb173 100644
--- a/apt-pkg/vendorlist.h
+++ b/apt-pkg/vendorlist.h
@@ -17,12 +17,13 @@
 #include <vector>
 #include <apt-pkg/vendor.h>
 #include <apt-pkg/configuration.h>
+#include <apt-pkg/macros.h>
 
 using std::string;
 using std::vector;
 
 
-class pkgVendorList
+class __deprecated pkgVendorList
 {
    protected:
    vector<Vendor const *> VendorList;
diff --git a/debian/changelog b/debian/changelog
index 9f1944b62..c6df16bb9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ apt (0.8.13.1) UNRELEASED; urgency=low
   [ David Kalnischkies ]
   * apt-pkg/deb/dpkgpm.cc:
     - skip --configure if all packages disappeared
+  * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc:
+    - mark them as deprecated as they are unused
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 16 Mar 2011 18:37:53 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 16 Mar 2011 21:23:32 +0100
 
 apt (0.8.13) unstable; urgency=low