merge from debian, omit disable of the 0.7 API

1 files changed, 16 insertions, 0 deletions

diff --git a/python/python-apt.h b/python/python-apt.h
index b9fc9212..6f2a02df 100644
--- a/python/python-apt.h
+++ b/python/python-apt.h
@@ -167,6 +167,13 @@ struct _PyAptPkgAPIStruct {
     PyObject* (*version_fromcpp)(pkgCache::VerIterator const &obj, bool Delete, PyObject *Owner);
     pkgCache::VerIterator& (*version_tocpp)(PyObject *self);
 
+    PyTypeObject *group_type;
+    PyObject* (*group_fromcpp)(pkgCache::GrpIterator const &obj, bool Delete, PyObject *Owner);
+    pkgCache::GrpIterator& (*group_tocpp)(PyObject *self);
+    
+    PyTypeObject *orderlist_type;
+    PyObject* (*orderlist_fromcpp)(pkgOrderList* const &obj, bool Delete, PyObject *Owner);
+    pkgOrderList*& (*orderlist_tocpp)(PyObject *self);
 };
 
 // Checking macros.
@@ -184,6 +191,7 @@ struct _PyAptPkgAPIStruct {
 # define PyDependency_Check(op)       PyObject_TypeCheck(op, &PyDependency_Type)
 # define PyDependencyList_Check(op)   PyObject_TypeCheck(op, &PyDependencyList_Type)
 # define PyDescription_Check(op)      PyObject_TypeCheck(op, &PyDescription_Type)
+# define PyGroup_Check(op)            PyObject_TypeCheck(op, &PyGroup_Type)
 # define PyHashes_Check(op)           PyObject_TypeCheck(op, &PyHashes_Type)
 # define PyHashString_Check(op)       PyObject_TypeCheck(op, &PyHashString_Type)
 # define PyIndexRecords_Check(op)     PyObject_TypeCheck(op, &PyIndexRecords_Type)
@@ -217,12 +225,14 @@ struct _PyAptPkgAPIStruct {
 # define PyDependencyList_CheckExact(op)   (op->op_type == &PyDependencyList_Type)
 # define PyDescription_CheckExact(op)      (op->op_type == &PyDescription_Type)
 # define PyHashes_CheckExact(op)           (op->op_type == &PyHashes_Type)
+# define PyGroup_CheckExact(op)            (op->op_type == &PyGroup_Type)
 # define PyHashString_CheckExact(op)       (op->op_type == &PyHashString_Type)
 # define PyIndexRecords_CheckExact(op)     (op->op_type == &PyIndexRecords_Type)
 # define PyMetaIndex_CheckExact(op)        (op->op_type == &PyMetaIndex_Type)
 # define PyPackage_CheckExact(op)          (op->op_type == &PyPackage_Type)
 # define PyPackageFile_CheckExact(op)      (op->op_type == &PyPackageFile_Type)
 # define PyIndexFile_CheckExact(op)        (op->op_type == &PyIndexFile_Type)
+# define PyOrderList_CheckExact(op)        (op->op_type == &PyOrderList_Type)
 # define PyPackageList_CheckExact(op)      (op->op_type == &PyPackageList_Type)
 # define PyPackageManager_CheckExact(op)   (op->op_type == &PyPackageManager_Type)
 # define PyPackageRecords_CheckExact(op)   (op->op_type == &PyPackageRecords_Type)
@@ -260,6 +270,7 @@ static int import_apt_pkg(void) {
 #  define PyDependency_Type        *(_PyAptPkg_API->dependency_type)
 #  define PyDependencyList_Type    *(_PyAptPkg_API->dependencylist_type)
 #  define PyDescription_Type       *(_PyAptPkg_API->description_type)
+#  define PyGroup_Type             *(_PyAptPkg_API->group_type)
 #  define PyHashes_Type            *(_PyAptPkg_API->hashes_type)
 #  define PyHashString_Type        *(_PyAptPkg_API->hashstring_type)
 #  define PyIndexRecords_Type      *(_PyAptPkg_API->indexrecords_type)
@@ -267,6 +278,7 @@ static int import_apt_pkg(void) {
 #  define PyPackage_Type           *(_PyAptPkg_API->package_type)
 #  define PyPackageFile_Type       *(_PyAptPkg_API->packagefile_type)
 #  define PyIndexFile_Type         *(_PyAptPkg_API->packageindexfile_type)
+#  define PyOrderList_Type         *(_PyAptPkg_API->orderlist_type)
 #  define PyPackageList_Type       *(_PyAptPkg_API->packagelist_type)
 #  define PyPackageManager_Type    *(_PyAptPkg_API->packagemanager_type)
 #  define PyPackageRecords_Type    *(_PyAptPkg_API->packagerecords_type)
@@ -292,6 +304,7 @@ static int import_apt_pkg(void) {
 #  define PyDependency_ToCpp       _PyAptPkg_API->dependency_tocpp
 #  define PyDependencyList_ToCpp   _PyAptPkg_API->dependencylist_tocpp // NULL
 #  define PyDescription_ToCpp      _PyAptPkg_API->description_tocpp
+#  define PyGroup_ToCpp            _PyAptPkg_API->group_tocpp
 #  define PyHashes_ToCpp           _PyAptPkg_API->hashes_tocpp
 #  define PyHashString_ToCpp       _PyAptPkg_API->hashstring_tocpp
 #  define PyIndexRecords_ToCpp     _PyAptPkg_API->indexrecords_tocpp
@@ -299,6 +312,7 @@ static int import_apt_pkg(void) {
 #  define PyPackage_ToCpp          _PyAptPkg_API->package_tocpp
 #  define PyPackageFile_ToCpp      _PyAptPkg_API->packagefile_tocpp
 #  define PyIndexFile_ToCpp        _PyAptPkg_API->packageindexfile_tocpp
+#  define PyOrderList_ToCpp        _PyAptPkg_API->orderlist_tocpp // NULL
 #  define PyPackageList_ToCpp      _PyAptPkg_API->packagelist_tocpp // NULL
 #  define PyPackageManager_ToCpp   _PyAptPkg_API->packagemanager_tocpp
 #  define PyPackageRecords_ToCpp   _PyAptPkg_API->packagerecords_tocpp
@@ -324,6 +338,7 @@ static int import_apt_pkg(void) {
 #  define PyDependency_FromCpp       _PyAptPkg_API->dependency_fromcpp
 #  define PyDependencyList_FromCpp   _PyAptPkg_API->dependencylist_fromcpp // NULL
 #  define PyDescription_FromCpp      _PyAptPkg_API->description_fromcpp
+#  define PyGroup_FromCpp            _PyAptPkg_API->group_fromcpp
 #  define PyHashes_FromCpp           _PyAptPkg_API->hashes_fromcpp
 #  define PyHashString_FromCpp       _PyAptPkg_API->hashstring_fromcpp
 #  define PyIndexRecords_FromCpp     _PyAptPkg_API->indexrecords_fromcpp
@@ -331,6 +346,7 @@ static int import_apt_pkg(void) {
 #  define PyPackage_FromCpp          _PyAptPkg_API->package_fromcpp
 #  define PyPackageFile_FromCpp      _PyAptPkg_API->packagefile_fromcpp
 #  define PyIndexFile_FromCpp        _PyAptPkg_API->packageindexfile_fromcpp
+#  define PyOrderList_FromCpp        _PyAptPkg_API->orderlist_fromcpp // NULL
 #  define PyPackageList_FromCpp      _PyAptPkg_API->packagelist_fromcpp // NULL
 #  define PyPackageManager_FromCpp   _PyAptPkg_API->packagemanager_fromcpp
 #  define PyPackageRecords_FromCpp   _PyAptPkg_API->packagerecords_fromcpp