merge from debian, omit disable of the 0.7 API

1 files changed, 60 insertions, 0 deletions

diff --git a/doc/source/c++/api.rst b/doc/source/c++/api.rst
index 97ab24d1..63ed1599 100644
--- a/doc/source/c++/api.rst
+++ b/doc/source/c++/api.rst
@@ -389,6 +389,38 @@ Description (pkgCache::DescIterator)
     Return the :ctype:`pkgCache::DescIterator` reference contained in the
     Python object *object*.
 
+
+Group (pkgCache::GrpIterator)
+----------------------------------
+.. versionadded:: 0.8.0
+
+.. cvar:: PyTypeObject PyGroup_Type
+
+    The type object for :class:`apt_pkg.Group` objects.
+
+.. cfunction:: int PyGroup_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Group` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyGroup_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.Group` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyGroup_FromCpp(pkgCache::GrpIterator &cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.Group` object from the :ctype:`pkgCache::GrpIterator`
+    reference given by the parameter *cpp*. If the parameter *delete* is
+    true, *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The parameter *owner* should be
+    a PyObject of the type :cdata:`PyCache_Type`.
+
+.. cfunction:: pkgCache::GrpIterator& PyGroup_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgCache::GrpIterator` reference contained in the
+    Python object *object*.
+
 Hashes (Hashes)
 ----------------------------------
 .. cvar:: PyTypeObject PyHashes_Type
@@ -590,6 +622,34 @@ IndexFile (pkgIndexFile)
     Return the :ctype:`pkgIndexFile` pointer contained in the Python object
     *object*.
 
+OrderList (pkgOrderList)
+---------------------------
+.. cvar:: PyTypeObject PyOrderList_Type
+
+    The type object for :class:`apt_pkg.OrderList` objects.
+
+.. cfunction:: int PyOrderList_Check(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.OrderList` object, or
+    a subclass thereof.
+
+.. cfunction:: int PyOrderList_CheckExact(PyObject *object)
+
+    Check that the object *object* is an :class:`apt_pkg.OrderList` object
+    and no subclass thereof.
+
+.. cfunction:: PyObject* PyOrderList_FromCpp(pkgOrderList *cpp, bool delete, PyObject *owner)
+
+    Create a new :class:`apt_pkg.OrderList` object from the :ctype:`pkgOrderList`
+    pointer given by the parameter *cpp*. If the parameter *delete* is
+    true, the object pointed to by *cpp* will be deleted when the reference
+    count of the returned object reaches 0. The owner must be a
+    :class:`apt_pkg.DepCache` object.
+
+.. cfunction:: pkgOrderList* PyOrderList_ToCpp(PyObject *object)
+
+    Return the :ctype:`pkgOrderList` pointer contained in the Python object
+    *object*.
 
 PackageManager (pkgPackageManager)
 ----------------------------------