merge sources.list lines based on Release filename

[apt.git] / apt-pkg / upgrade.h

diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index 436d383007fffbc4d58710f068f07221b11d9f37..71dbb4fd3619fbb7fb04e7a1242605204ac3f9dc 100644 (file)
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -10,21 +10,26 @@
 #ifndef PKGLIB_UPGRADE_H
 #define PKGLIB_UPGRADE_H
 
 #ifndef PKGLIB_UPGRADE_H
 #define PKGLIB_UPGRADE_H
 

+#include <stddef.h>
+#include <apt-pkg/macros.h>
+
+class pkgDepCache;
+class OpProgress;
+

 namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
          FORBID_REMOVE_PACKAGES = 1,
 namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
          FORBID_REMOVE_PACKAGES = 1,

-         FORBID_INSTALL_NEW_PACKAGES = 2
+         FORBID_INSTALL_NEW_PACKAGES = 2,
+        ALLOW_EVERYTHING = 0

       };
       };

-      bool Upgrade(pkgDepCache &Cache, int UpgradeMode);
+      bool Upgrade(pkgDepCache &Cache, int UpgradeMode, OpProgress * const Progress = NULL);

    }
 }
 
    }
 }
 

-// please use APT::Upgrade::Upgrade() instead
-bool pkgDistUpgrade(pkgDepCache &Cache);
-bool pkgAllUpgrade(pkgDepCache &Cache);
-bool pkgMinimizeUpgrade(pkgDepCache &Cache);
-
+APT_DEPRECATED_MSG("Use APT::Upgrade::Upgrade() instead") bool pkgDistUpgrade(pkgDepCache &Cache);
+APT_DEPRECATED_MSG("Use APT::Upgrade::Upgrade() instead") bool pkgAllUpgrade(pkgDepCache &Cache);

 
 

+bool pkgMinimizeUpgrade(pkgDepCache &Cache);

 #endif
 #endif