Updated to the 0.7.9x series (FFe LP: #531518)

[ Julian Andres Klode ]
* python/generic.cc:
  - Fix a memory leak when using old attribute names.
* debian/control:
  - Change priority to standard, keep -doc and -dev on optional.
[ Michael Vogt ]
* apt/cache.py:
  - make cache open silent by default (use apt.progress.base.OpProgress)
* tests/data/aptsources_ports/sources.list:
  - fix ports test-data
* debian/control
  - build against XS-Python-Versions: 2.6, 3.1
* tests/test_apt_cache.py:
  - add simple test for basic cache/dependency iteration
* apt/__init__.py:
  - only show deprecation warnings if PYTHON_APT_DEPRECATION_WARNINGS
    is set in the environment. While we do want to have the new API its
    not feasible to port all apps in the lucid timeframe. Once lucid
    is released we turn the warnings on by default again

* Revert 0.7.93.3 and just set APT::Architecture to i386 for
  test_aptsources; fixes FTBFS on powerpc.
* Pass --exclude=migrate-0.8.py to dh_pycentral; in order to not depend
  on python2.6; but recommend python2.6.
* Use dh_link instead of ln for python-apt-doc (Closes: #573523).
* Pass --link-doc=python-apt to dh_installdocs.
* Install examples to python-apt-doc instead of python-apt.
* tests/test_all.py: Write information header to stderr, not stdout.
* Build documentation only when needed (when building python-apt-doc).
* Move documentation into python-apt-doc (Closes: #572617)
* Build documentation only once on the default Python version.
* python/acquire-item.cc:
  - Add AcquireItem.partialsize member.
* python/apt_pkgmodule.cc:
  - Treat '>>' and '>', '<<' and '<' as identical in check_dep (LP: #535667).
* python/generic.cc:
  - Map UntranslatedDepType to dep_type_untranslated.
* python/tag.cc:
  - Hack the TagFile iterator to not use shared storage (Closes: #572596):
    Scan once, duplicate the section data, and scan again.
* apt/package.py:
  - Create a string class BaseDependency.__dstr which makes '>' equal to
    '>>' and '<' equal to '<<' (compatibility).
  - Use the binary package version in Version.fetch_source() if the
    source version is not specified (i.e. in the normal case).
  - Always return unicode strings in Package.get_changelog (Closes: #572998).
* apt/progress/text.py:
  - Drop InstallProgress, it's useless to keep this alias around.
* apt/progress/old.py:
  - Let the new method call the old one; e.g. status_update() now calls
    self.statusUpdate(). This improves compatibility for sub classes.
* Merge with Ubuntu:
  - util/get_ubuntu_mirrors_from_lp.py:
    + rewritten to use +archivemirrors-rss and feedburner
  - pre-build.sh: update ubuntu mirrors on bzr-buildpackage (and also do this
    for Debian mirrors)
  - add break for packagekit-backend-apt (<= 0.4.8-0ubuntu4)
* tests:
  - test_deps: Add tests for apt_pkg.CheckDep, apt_pkg.check_dep,
    apt_pkg.parse_depends and apt_pkg.parse_src_depends.
* tests/data/aptsources/sources.list.testDistribution:
  - change one mirror which is not on the mirror list anymore.
* utils/get_debian_mirrors.py:
  - Parse Mirrors.masterlist instead of the HTML web page.
* utils/get_ubuntu_mirrors_from_lp.py:
  - Sort the mirror list of each country.
  - Use generic MirrorsFile key instead of per-architecture ones in
    order to fix FTBFS on !amd64 !i386 (Closes: #571752)
[ Julian Andres Klode ]
* Fix some places where the old API was still used:
  - apt/utils.py: Completely ported, previous one was old-API from Ubuntu.
  - apt/cache.py: Use the new progress classes instead of the old ones.
  - apt/package.py: Various smaller issues fixed, probably caused by merge.
* utils/migrate-0.8.py:
  - Improve C++ parsing and add apt.progress.old to the modules, reduces
    false positives.
  - Ship the list of deprecated things in the apt_pkg and apt_inst modules
    inside the script itself, so we don't have to parse the source code
    anymore.
* python:
  - Handle deprecated attributes and methods in the tp_gettattro slot, this
    allows us to easily warn if a deprecated function is used.
* python/tagfile.cc:
  - Implement the iterator protocol in TagFile.
* python/cache.cc:
  - Implement Cache.__len__() and Cache.__contains__() (Closes: #571443).
* data/templates/Debian.info.in:
  - Replace the MatchURI with one that really matches something.
* aptsources/distro.py:
  - Call lsb_release with -idrc instead of --all.
* tests:
  - Fix aptsources tests to use local data files if available.
  - test_all.py: Use local modules instead of system ones if possible.
* data/templates/*.in: Switch MirrorsFile to relative filenames.
  - setup.py: Copy the mirror lists to the build directory
  - aptsources/distinfo.py: Support relative filenames for MirrorsFile.
* debian/rules:
  - Run tests during build time.
* debian/python-apt.install:
  - Install utils/migrate-0.8.py to /usr/share/python-apt/.

[ Michael Vogt ]
* apt/cache.py:
  - call install_progress.startUpdate()/finishUpdate() to keep
    compatibility with older code
* apt/progress/base.py:
  - restore "self.statusfd, self.writefd" type, provide additional
    self.status_stream and self.write_stream file like objects
* python/progress.cc:
  - try to call compatibility functions first, then new functions
[ Julian Andres Klode ]
* Fix reference counting for old progress classes (Closes: #566370).
* apt/cache.py:
  - Fix Cache.update() to not raise errors on successful updates.
* python/progress.cc:
  - Fix some threading issues (add some missing PyCbObj_BEGIN_ALLOW_THREADS)
* python/acquire-item.cc:
  - Support items without an owner set.
* python/tarfile.cc:
  - When extracting, only allocate a new buffer if the old one was too small.
  - Do not segfault if TarFile.go() is called without a member name.
  - Clone all pkgDirStream::Item's so apt_pkg.TarMember object can be used
    outside of the callback function passed to go().
  - If only one member is requested, extract just that one.
* Drop the segfault prevention measures from the Acquire code, as they fail
  to work. A replacement will be added once destruction callbacks are added
  in APT.
* Merge the CppOwnedPyObject C++ class into CppPyObject.
* Remove inline functions from the C++ API, export them instead.
* Localization
  - de.po: Update against new template
* python/arfile.cc:
  - Handle the case where ararchive_new returns NULL in debfile_new.
* apt/progress/base.py:
  - select.error objects do not have an errno attribute (Closes: #568005)
* doc/client-example.cc: Update against the new API.
* Fix typos of separated in multiple files (reported by lintian).
* debian/control:
  - Make python-apt-dev depend on ${misc:Depends} and recommend python-dev.
  - Set Standards-Version to 3.8.4.
[ Michael Vogt ]
[ Julian Andres Klode ]
* Merge debian-sid and debian-experimental.
* Add a tutorial on how to do things which are possible with apt-get,
  like apt-get --print-uris update (cf. #551164).
* Build for Python 2.5, 2.6 and 3.1; 2.6 and 3.1 hit unstable on Jan 16.
  - Use DH_PYCENTRAL=nomove for now because include-links seems broken
* Merge lp:~forest-bond/python-apt/cache-is-virtual-package-catch-key-error
  - Return False in Cache.is_virtual_package if the package does not exist.
* Make all class-level constants have uppercase names.
* Rewrite apt.progress.gtk2 documentation by hand and drop python-gtk2
  build-time dependency.
* aptsources:
  - Make all classes subclasses of object.
  - distro.py: Support Python 3, decode lsb_release results using utf-8.
* apt/progress/base.py:
  - Fix some parsing of dpkg status fd.
* apt/progress/text.py:
  - Replace one print statement with a .write() call.
* Rename apt_pkg.PackageIndexFile to apt_pkg.IndexFile.
[ Colin Watson ]
* apt/progress/__init__.py:
  - Fix InstallProgress.updateInterface() to cope with read() returning 0
    on non-blocking file descriptors (LP: #491027).

* New features:
  - Provide a C++ API in the package python-apt-dev (Closes: #334923).
  - Add apt_pkg.HashString and apt_pkg.IndexRecords (Closes: #456141).
  - Add apt_pkg.Policy class (Closes: #382725).
  - Add apt_pkg.Hashes class.
  - Allow types providing __new__() to be subclassed.
  - Add apt_pkg.DepCache.mark_auto() and apt.Package.mark_auto() methods to
    mark a package as automatically installed.
  - Make AcquireFile a subclass of AcquireItem, thus inheriting attributes.
  - New progress handling in apt.progress.base and apt.progress.text. Still
    missing Qt4 progress handlers.
  - Classes in apt_inst (Closes: #536096)
    + You can now use apt_inst.DebFile.data to access the data.tar.* member
      regardless of its compression (LP: #44493)
* Unification of dependency handling:
  - apt_pkg.parse_[src_]depends() now use CompType instead of CompTypeDeb
    (i.e. < instead of <<) to match the interface of Version.depends_list_str
  - apt_pkg.SourceRecords.build_depends matches exactly the interface of
    Version.depends_list_str just with different keys (e.g. Build-Depends).
    + Closes: #468123 - there is no need anymore for binding CompType or
      CompTypeDeb, because we don't return integer values for CompType
      anymore.
* Bugfixes:
  - Delete pointers correctly, fixing memory leaks (LP: #370149).
  - Drop open() and close() in apt_pkg.Cache as they cause segfaults.
  - Raise ValueError in AcquireItem if the Acquire process is shut down
    instead of segfaulting.
* Other stuff:
  - Merge releases 0.7.10.4 - 0.7.12.1 from unstable.
  - Merge Configuration,ConfigurationPtr,ConfigurationSub into one type.
  - Simplify the whole build process by using a single setup.py.
  - The documentation has been restructured and enhanced with tutorials.
  - Only recommend lsb-release instead of depending on it. Default to
    Debian unstable if lsb_release is not available.
[ Julian Andres Klode ]
* Rename where needed according to PEP 8 conventions (Closes: #481061)
* Where possible, derive apt.package.Record from collections.Mapping.
* ActionGroups can be used as a context manager for the 'with' statement.
* utils/migrate-0.8.py: Helper to check Python code for deprecated functions,
  attributes,etc. Has to be run from the python-apt source tree, but can be
  used for all Python code using python-apt.
* debian/control: Only recommend libjs-jquery (Closes: #527543).
[ Stefano Zacchiroli ]
* debian/python-apt.doc-base: register the documentation with the
  doc-base system (Closes: #525134)
[ Sebastian Heinlein ]
* apt/package.py: Add Package.get_version() which returns a Version instance
  for the given version string or None (Closes: #523998)
* Introduce support for Python 3 (Closes: #523645)
* Support the 'in' operator (e.g. "k in d") in Configuration{,Ptr,Sub}
  objects (e.g. apt_pkg.Config) and in TagSections (apt_pkg.ParseSection())
* Replace support for file objects with a more generic support for any object
  providing a fileno() method and for file descriptors (integers).
* Add support for the Breaks fields
* Only create Package objects when they are requested, do not keep them in
  a dict. Saves 10MB for 25,000 packages on my machine.
* apt/package.py: Allow to set the candidate of a package (Closes: #523997)
  - Support assignments to the 'candidate' property of Package objects.
  - Initial patch by Sebastian Heinlein
[ Michael Vogt ]
* data/templates/Ubuntu.info.in:
  - make armel point to ports.ubuntu.com (LP: #531876)
[ Emmet Hikory ]
* data/templates/Ubuntu.info.in:
  - refactor to use ports by default for gutsy and newer releases
  - Set appropriate exceptions to defaults for warty-lucid
* Drop build dependency on python2.4.
* apt/utils.py:
  - add some misc utils like get_release_filename_for_pkg()
[ Michael Vogt ]
* apt/cache.py: 
  - improved docstring for the cache
  - add "enhances" property
* data/templates/Ubuntu.info.in:
  - add lucid
* python/cache.cc:
  - add UntranslatedDepType attribute to DependencyType
  - add DepTypeEnum that returns a value from 
    {DepDepends, DepPreDepends, ...}
* python/apt_pkgmodule.cc:
  - add DepDpkgBreaks, DepEnhances constants
* doc/source/apt_pkg/{cache.rst, index.rst}:
  - update documentation as well
* Fix FTBFS with python-debian (>= 0.1.13) on Python 2.4 by not using it to
  get a version number in setup.py (Closes: #523473)
* apt/package.py:
  - (Package.candidateRecord): Fix missing 'd' in 'record'
  - (DeprecatedProperty.__get__): Only warn when used on objects, this
    makes it easier to use e.g. pydoc,sphinx,pychecker.
* Merged python-apt consolidation branch by Sebastian
  Heinlein (many thanks)
* apt/cache.py:
  - new method "isVirtualPackage()"
  - new method "getProvidingPackages()"
  - new method "getRequiredDownload()"
  - new method "additionalRequiredSpace()"
* apt/debfile.py:
  - move a lot of the gdebi code into this file, this
    provides interfaces for querrying and installing
    .deb files and .dsc files
* apt/package.py:
  - better description parsing
  - new method "installedFiles()"
  - new method "getChangelog()"
* apt/gtk/widgets.py:
  - new gobject GOpProgress
  - new gobject GFetchProgress
  - new gobject GInstallProgress
  - new gobject GDpkgInstallProgress
  - new widget GtkAptProgress
* doc/examples/gui-inst.py:
  - updated to use the new widgets
* debian/control:
  - add suggests for python-gtk2 and python-vte
* setup.py:
  - build html/ help of the apt and aptsources modules
    into /usr/share/doc/python-apt/html
* apt/__init__.py:
  - remove the future warning
* Non-maintainer upload.
* data/templates/Debian.info.in: Set the BaseURI to security.debian.org for
  lenny/updates, etch/updates and sarge/updates. (Closes: #503237)
* data/templates/Debian.info.in:
  - add 'lenny' template info (closes: #476364)
* aptsources/distinfo.py:
  - fix template matching for arch specific code (LP: #244093)

1 files changed, 126 insertions, 27 deletions

diff --git a/python/apt_pkgmodule.h b/python/apt_pkgmodule.h
index e047bcd8..da647c3f 100644
--- a/python/apt_pkgmodule.h
+++ b/python/apt_pkgmodule.h
@@ -11,15 +11,24 @@
 #define APT_PKGMODULE_H
 
 #include <Python.h>
+#include <apt-pkg/hashes.h>
+#include <apt-pkg/acquire-item.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/packagemanager.h>
+#include <apt-pkg/version.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/pkgcache.h>
+#include <apt-pkg/cachefile.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/init.h>
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/cdrom.h>
+#include <apt-pkg/algorithms.h>
+#include "generic.h"
 
 // Configuration Stuff
-#define Configuration_Check(op) ((op)->ob_type == &ConfigurationType || \
-                                 (op)->ob_type == &ConfigurationPtrType || \
-                                 (op)->ob_type == &ConfigurationSubType)
-extern PyTypeObject ConfigurationType;
-extern PyTypeObject ConfigurationPtrType;
-extern PyTypeObject ConfigurationSubType;
-extern PyTypeObject VersionType;
+extern PyTypeObject PyConfiguration_Type;
+extern PyTypeObject PyVersion_Type;
 
 extern char *doc_LoadConfig;
 extern char *doc_LoadConfigISC;
@@ -31,8 +40,8 @@ PyObject *LoadConfigDir(PyObject *Self,PyObject *Args);
 PyObject *ParseCommandLine(PyObject *Self,PyObject *Args);
 
 // Tag File Stuff
-extern PyTypeObject TagSecType;
-extern PyTypeObject TagFileType;
+extern PyTypeObject PyTagSection_Type;
+extern PyTypeObject PyTagFile_Type;
 extern char *doc_ParseSection;
 extern char *doc_ParseTagFile;
 extern char *doc_RewriteSection;
@@ -52,54 +61,144 @@ PyObject *StrTimeRFC1123(PyObject *self,PyObject *Args);
 PyObject *StrStrToTime(PyObject *self,PyObject *Args);
 PyObject *StrCheckDomainList(PyObject *Self,PyObject *Args);
 
+PyObject *PyAcquire_GetItem(PyObject *self, pkgAcquire::Item *item);
+PyObject *PyAcquire_GetItemDesc(PyObject *self, pkgAcquire::ItemDesc *item);
+bool     PyAcquire_DropItem(PyObject *self, pkgAcquire::Item *item);
+
 // Cache Stuff
-extern PyTypeObject PkgCacheType;
-extern PyTypeObject PkgCacheFileType;
-extern PyTypeObject PkgListType;
-extern PyTypeObject PackageType;
-extern PyTypeObject PackageFileType;
-extern PyTypeObject DependencyType;
-extern PyTypeObject RDepListType;
+extern PyTypeObject PyCache_Type;
+extern PyTypeObject PyCacheFile_Type;
+extern PyTypeObject PyPackageList_Type;
+extern PyTypeObject PyDescription_Type;
+extern PyTypeObject PyPackage_Type;
+extern PyTypeObject PyPackageFile_Type;
+extern PyTypeObject PyDependency_Type;
+extern PyTypeObject PyDependencyList_Type;
 PyObject *TmpGetCache(PyObject *Self,PyObject *Args);
 
 // DepCache
-extern PyTypeObject PkgDepCacheType;
+extern PyTypeObject PyDepCache_Type;
 PyObject *GetDepCache(PyObject *Self,PyObject *Args);
 
 // pkgProblemResolver
-extern PyTypeObject PkgProblemResolverType;
+extern PyTypeObject PyProblemResolver_Type;
 PyObject *GetPkgProblemResolver(PyObject *Self, PyObject *Args);
 PyObject *GetPkgActionGroup(PyObject *Self, PyObject *Args);
 
+extern PyTypeObject PyActionGroup_Type;
 // cdrom
-extern PyTypeObject PkgCdromType;
+extern PyTypeObject PyCdrom_Type;
 PyObject *GetCdrom(PyObject *Self,PyObject *Args);
 
 // acquire
-extern PyTypeObject PkgAcquireType;
+extern PyTypeObject PyAcquireItem_Type;
+extern PyTypeObject PyAcquire_Type;
+extern PyTypeObject PyAcquireFile_Type;
 extern char *doc_GetPkgAcqFile;
 PyObject *GetAcquire(PyObject *Self,PyObject *Args);
 PyObject *GetPkgAcqFile(PyObject *Self, PyObject *Args, PyObject *kwds);
 
 // packagemanager
-extern PyTypeObject PkgManagerType;
+extern PyTypeObject PyPackageManager_Type;
 PyObject *GetPkgManager(PyObject *Self,PyObject *Args);
 
 
 // PkgRecords Stuff
-extern PyTypeObject PkgRecordsType;
+extern PyTypeObject PyPackageRecords_Type;
+extern PyTypeObject PySourceRecords_Type;
 PyObject *GetPkgRecords(PyObject *Self,PyObject *Args);
 PyObject *GetPkgSrcRecords(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PkgSourceListType;
+extern PyTypeObject PySourceList_Type;
 PyObject *GetPkgSourceList(PyObject *Self,PyObject *Args);
 
 // pkgSourceList
-extern PyTypeObject PackageIndexFileType;
+extern PyTypeObject PyIndexFile_Type;
 
 // metaIndex
-extern PyTypeObject MetaIndexType;
-
-
+extern PyTypeObject PyMetaIndex_Type;
+
+// HashString
+extern PyTypeObject PyHashString_Type;
+
+// IndexRecord
+extern PyTypeObject PyIndexRecords_Type;
+
+// Policy
+extern PyTypeObject PyPolicy_Type;
+extern PyTypeObject PyHashes_Type;
+extern PyTypeObject PyAcquireItemDesc_Type;
+extern PyTypeObject PyAcquireWorker_Type;
+extern PyTypeObject PySystemLock_Type;
+extern PyTypeObject PyFileLock_Type;
+
+// Functions to be exported in the public API.
+
+# define PyAcquire_ToCpp           GetCpp<pkgAcquire*>
+# define PyAcquireFile_ToCpp       GetCpp<pkgAcqFile*>
+# define PyAcquireItem_ToCpp       GetCpp<pkgAcquire::Item*>
+# define PyAcquireItemDesc_ToCpp   GetCpp<pkgAcquire::ItemDesc*>
+# define PyAcquireWorker_ToCpp     GetCpp<pkgAcquire::Worker*>
+# define PyActionGroup_ToCpp       GetCpp<pkgDepCache::ActionGroup*>
+# define PyCache_ToCpp             GetCpp<pkgCache*>
+# define PyCacheFile_ToCpp         GetCpp<pkgCacheFile*>
+# define PyCdrom_ToCpp             GetCpp<pkgCdrom>
+# define PyConfiguration_ToCpp     GetCpp<Configuration*>
+# define PyDepCache_ToCpp          GetCpp<pkgDepCache*>
+# define PyDependency_ToCpp        GetCpp<pkgCache::DepIterator>
+# define PyDependencyList_ToCpp    GetCpp<RDepListStruct> // TODO
+# define PyDescription_ToCpp       GetCpp<pkgCache::DescIterator>
+# define PyHashes_ToCpp            GetCpp<Hashes>
+# define PyHashString_ToCpp        GetCpp<HashString*>
+# define PyIndexRecords_ToCpp      GetCpp<indexRecords*>
+# define PyMetaIndex_ToCpp         GetCpp<metaIndex*>
+# define PyPackage_ToCpp           GetCpp<pkgCache::PkgIterator>
+# define PyPackageFile_ToCpp       GetCpp<pkgCache::PkgFileIterator>
+# define PyIndexFile_ToCpp         GetCpp<pkgIndexFile*>
+# define PyPackageList_ToCpp       GetCpp<PkgListStruct> // TODO
+# define PyPackageManager_ToCpp    GetCpp<pkgPackageManager*>
+# define PyPackageRecords_ToCpp    GetCpp<PkgRecordsStruct> // TODO
+# define PyPolicy_ToCpp            GetCpp<pkgPolicy*>
+# define PyProblemResolver_ToCpp   GetCpp<pkgProblemResolver*>
+# define PySourceList_ToCpp        GetCpp<pkgSourceList*>
+# define PySourceRecords_ToCpp     GetCpp<PkgSrcRecordsStruct> // TODO
+# define PyTagFile_ToCpp           GetCpp<pkgTagFile>
+# define PyTagSection_ToCpp        GetCpp<pkgTagSection>
+# define PyVersion_ToCpp           GetCpp<pkgCache::VerIterator>
+
+PyObject* PyAcquire_FromCpp(pkgAcquire *fetcher, bool Delete, PyObject *Owner);
+PyObject* PyAcquireFile_FromCpp(pkgAcqFile* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyAcquireItem_FromCpp(pkgAcquire::Item* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyAcquireItemDesc_FromCpp(pkgAcquire::ItemDesc* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyAcquireWorker_FromCpp(pkgAcquire::Worker* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyActionGroup_FromCpp(pkgDepCache::ActionGroup* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyCache_FromCpp(pkgCache* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyCacheFile_FromCpp(pkgCacheFile* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyCdrom_FromCpp(pkgCdrom const &obj, bool Delete, PyObject *Owner);
+PyObject* PyConfiguration_FromCpp(Configuration* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyDepCache_FromCpp(pkgDepCache* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyDependency_FromCpp(pkgCache::DepIterator const &obj, bool Delete, PyObject *Owner);
+//PyObject* PyDependencyList_FromCpp(RDepListStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyDescription_FromCpp(pkgCache::DescIterator const &obj, bool Delete, PyObject *Owner);
+PyObject* PyHashes_FromCpp(Hashes const &obj, bool Delete, PyObject *Owner);
+PyObject* PyHashString_FromCpp(HashString* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyIndexRecords_FromCpp(indexRecords* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyMetaIndex_FromCpp(metaIndex* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPackage_FromCpp(pkgCache::PkgIterator const &obj, bool Delete, PyObject *Owner);
+PyObject* PyIndexFile_FromCpp(pkgIndexFile* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPackageFile_FromCpp(pkgCache::PkgFileIterator const &obj, bool Delete, PyObject *Owner);
+//PyObject* PyPackageList_FromCpp(PkgListStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPackageManager_FromCpp(pkgPackageManager* const &obj, bool Delete, PyObject *Owner);
+//PyObject* PyPackageRecords_FromCpp(PkgRecordsStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyPolicy_FromCpp(pkgPolicy* const &obj, bool Delete, PyObject *Owner);
+PyObject* PyProblemResolver_FromCpp(pkgProblemResolver* const &obj, bool Delete, PyObject *Owner);
+PyObject* PySourceList_FromCpp(pkgSourceList* const &obj, bool Delete, PyObject *Owner);
+//PyObject* PySourceRecords_FromCpp(PkgSrcRecordsStruct const &obj, bool Delete, PyObject *Owner);
+PyObject* PyTagFile_FromCpp(pkgTagFile const &obj, bool Delete, PyObject *Owner);
+PyObject* PyTagSection_FromCpp(pkgTagSection const &obj, bool Delete, PyObject *Owner);
+PyObject* PyVersion_FromCpp(pkgCache::VerIterator const &obj, bool Delete, PyObject *Owner);
+
+#include "python-apt.h"
 #endif
+