Merge debian-experimental.

8 files changed, 122 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index fa87d5a4..532a7de7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,9 @@
-python-apt (0.7.13.5) UNRELEASED; urgency=low
+python-apt (0.7.93) UNRELEASED; urgency=low
+
+  [ 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).
 
   [ Colin Watson ]
   * apt/progress/__init__.py:
@@ -20,7 +25,87 @@ python-apt (0.7.13.5) UNRELEASED; urgency=low
   * doc/source/apt_pkg/{cache.rst, index.rst}:
     - update documentation as well
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 02 Dec 2009 16:50:55 +0100
+ -- Julian Andres Klode <jak@debian.org>  Wed, 16 Sep 2009 19:26:17 +0200
+
+python-apt (0.7.92) experimental; urgency=low
+
+  * 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 <jak@debian.org>  Tue, 18 Aug 2009 16:42:56 +0200
+
+python-apt (0.7.91) experimental; urgency=low
+
+  [ 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)
+
+ -- Julian Andres Klode <jak@debian.org>  Fri, 05 Jun 2009 19:36:45 +0200
+
+python-apt (0.7.90) experimental; urgency=low
+
+  * 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
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 15 Apr 2009 13:47:42 +0200
 
 python-apt (0.7.13.4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f5ca1960..c5508e9b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,18 @@ Priority: optional
 Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Michael Vogt <mvo@debian.org>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.3
-XS-Python-Version: all
+XS-Python-Version: 2.5, 2.6, 3.1
 Build-Depends: apt-utils,
                debhelper (>= 7.3.5),
                libapt-pkg-dev (>= 0.7.22~),
-               python-all-dbg,
-               python-all-dev,
+               python2.5-dbg,
+               python2.5-dev,
+               python2.6-dev,
+               python2.6-dbg,
+               python3.1-dev,
+               python3.1-dbg,
                python-central (>= 0.5),
-               python-debian,
-               python-distutils-extra (>= 1.9.0),
+               python-distutils-extra (>= 2.0),
                python-gtk2 [!kfreebsd-amd64 !kfreebsd-i386],
                python-sphinx (>= 0.5),
                python-vte [!kfreebsd-amd64 !kfreebsd-i386]
@@ -21,8 +24,8 @@ Vcs-Browser: http://bzr.debian.org/loggerhead/apt/python-apt/debian-sid/changes
 
 Package: python-apt
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release
-Recommends: iso-codes, libjs-jquery
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Recommends: lsb-release, iso-codes, libjs-jquery
 Breaks: debdelta (<< 0.28~)
 Provides: ${python:Provides}
 Suggests: python-apt-dbg, python-gtk2, python-vte
@@ -52,3 +55,14 @@ Description: Python interface to libapt-pkg (debug extension)
  variety of functions.
  .
  This package contains the extension built for the Python debug interpreter.
+
+Package: python-apt-dev
+Architecture: all
+Depends: python-apt (>= ${source:Version}), libapt-pkg-dev (>= 0.7.10)
+Description: Python interface to libapt-pkg (development files)
+ The apt_pkg Python interface will provide full access to the internal
+ libapt-pkg structures allowing Python programs to easily perform a
+ variety of functions.
+ .
+ This package contains the header files needed to use python-apt objects from
+ C++ applications.
diff --git a/debian/copyright b/debian/copyright
index 8599328a..2df6807a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,17 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=443
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=59
 
 Files: *
 Copyright: © 2004-2009 Canonical Ltd.
+           © 2009 Julian Andres Klode <jak@debian.org>
 License: GPL-2+
 
+Files: tests/test_all.py, tests/test_hashes.py, utils/doclint.py
+Copyright: © 2009 Julian Andres Klode <jak@debian.org>
+License:
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved.
+
 Files: aptsources/*.py
 Copyright: © 2004-2009 Canonical Ltd.
 Copyright: © 2005 Gustavo Noronha Silva
diff --git a/debian/python-apt-dev.examples b/debian/python-apt-dev.examples
new file mode 100644
index 00000000..39f7bf97
--- /dev/null
+++ b/debian/python-apt-dev.examples
@@ -0,0 +1 @@
+doc/client-example.cc
diff --git a/debian/python-apt-dev.install b/debian/python-apt-dev.install
new file mode 100644
index 00000000..2a1405fd
--- /dev/null
+++ b/debian/python-apt-dev.install
@@ -0,0 +1,2 @@
+python/python-apt.h usr/include/python-apt/
+python/generic.h usr/include/python-apt/
diff --git a/debian/python-apt.doc-base b/debian/python-apt.doc-base
index d25926b7..e9b2040c 100644
--- a/debian/python-apt.doc-base
+++ b/debian/python-apt.doc-base
@@ -6,6 +6,3 @@ Section: Programming/Python
 Format: HTML
 Index: /usr/share/doc/python-apt/html/index.html
 Files: /usr/share/doc/python-apt/html/*
-
-Format: Text
-Files: /usr/share/doc/python-apt/text/*
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 177b5837..1bfc7c1c 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -3,5 +3,4 @@ AUTHORS
 TODO
 apt/README.apt
 data/templates/README.templates
-build/doc/html/
-build/doc/text/
+build/sphinx/html/
diff --git a/debian/rules b/debian/rules
index 84224e9a..6c9f6fb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 export DH_PYCENTRAL=include-links
 export DEBVER=$(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
-export CFLAGS=-Wno-write-strings
+export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 
 %:
 	dh --with python-central $@