Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/upgrade.h b/apt-pkg/upgrade.h
index 894f0625e3f9ee8d5c6a35e2537e31f5414e4d9f..a3f693d86e4356978a070fd4b26469ca4a48c8f2 100644 (file)
--- a/apt-pkg/upgrade.h
+++ b/apt-pkg/upgrade.h
@@ -11,6 +11,7 @@
 #define PKGLIB_UPGRADE_H
 
 #include <stddef.h>
+#include <apt-pkg/macros.h>
 
 class pkgDepCache;
 class OpProgress;
@@ -19,6 +20,7 @@ namespace APT {
    namespace Upgrade {
       // FIXME: make this "enum class UpgradeMode {" once we enable c++11
       enum UpgradeMode {
+        ALLOW_EVERYTHING = 0,
          FORBID_REMOVE_PACKAGES = 1,
          FORBID_INSTALL_NEW_PACKAGES = 2
       };
@@ -27,8 +29,8 @@ namespace APT {
 }
 
 // please use APT::Upgrade::Upgrade() instead
-bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
-bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED bool pkgDistUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
+APT_DEPRECATED bool pkgAllUpgrade(pkgDepCache &Cache, OpProgress * const Progress = NULL);
 
 bool pkgMinimizeUpgrade(pkgDepCache &Cache);
 #endif