merged from debian-sid

8 files changed, 99 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index ddb94ecf..d55c6246 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,62 @@
-python-apt (0.7.93.2) UNRELEASED; urgency=low
+python-apt (0.7.94.1) UNRELEASED; urgency=low
+
+  * Pass --exclude=migrate-0.8.py to dh_pycentral; in order to not depend
+    on python2.6.
+  * Use dh_link instead of ln for python-apt-doc (Closes: #573523).
+
+ -- Julian Andres Klode <jak@debian.org>  Thu, 11 Mar 2010 19:33:26 +0100
+
+python-apt (0.7.94) unstable; urgency=low
+
+  * 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.
+
+ -- Julian Andres Klode <jak@debian.org>  Wed, 10 Mar 2010 16:10:27 +0100
+
+python-apt (0.7.93.3) unstable; urgency=low
+
+  * data/templates/Ubuntu.info.in:
+    - Use generic MirrorsFile key instead of per-architecture ones in
+      order to fix FTBFS on !amd64 !i386 (Closes: #571752)
+
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 23:26:45 +0100
+
+python-apt (0.7.93.2) unstable; urgency=low
 
   [ Julian Andres Klode ]
   * Fix some places where the old API was still used:
@@ -8,8 +66,16 @@ python-apt (0.7.93.2) UNRELEASED; urgency=low
   * 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:
@@ -22,6 +88,8 @@ python-apt (0.7.93.2) UNRELEASED; urgency=low
     - 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:
@@ -33,7 +101,7 @@ python-apt (0.7.93.2) UNRELEASED; urgency=low
   * python/progress.cc:
     - try to call compatibility functions first, then new functions
 
- -- Julian Andres Klode <jak@debian.org>  Sun, 07 Feb 2010 19:58:40 +0100
+ -- Julian Andres Klode <jak@debian.org>  Sat, 27 Feb 2010 18:33:11 +0100
 
 python-apt (0.7.93.1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0c43f91e..af7aa055 100644
--- a/debian/control
+++ b/debian/control
@@ -23,10 +23,10 @@ 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}
-Recommends: lsb-release, iso-codes, libjs-jquery
-Breaks: debdelta (<< 0.28~)
+Recommends: lsb-release, iso-codes
+Breaks: debdelta (<< 0.28~), packagekit-backend-apt (<= 0.4.8-0ubuntu4)
 Provides: ${python:Provides}
-Suggests: python-apt-dbg, python-gtk2, python-vte
+Suggests: python-apt-dbg, python-gtk2, python-vte, python-apt-doc
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt_pkg Python interface will provide full access to the internal
@@ -41,6 +41,19 @@ Description: Python interface to libapt-pkg
  The included 'aptsources' Python interface provides an abstraction of
  the sources.list configuration on the repository and the distro level.
 
+Package: python-apt-doc
+Architecture: all
+Section: doc
+Depends: libjs-jquery, ${misc:Depends}
+Enhances: python-apt
+Replaces: python-apt (<< 0.7.94)
+Description: Python interface to libapt-pkg (API documentation)
+ 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 API documentation of python-apt.
+
 Package: python-apt-dbg
 Priority: extra
 Architecture: any
diff --git a/debian/python-apt.doc-base b/debian/python-apt-doc.doc-base
index e9b2040c..4f3c4d31 100644
--- a/debian/python-apt.doc-base
+++ b/debian/python-apt-doc.doc-base
@@ -4,5 +4,5 @@ Abstract: API reference manual for Python bindings to libapt-pkg
 Section: Programming/Python
 
 Format: HTML
-Index: /usr/share/doc/python-apt/html/index.html
-Files: /usr/share/doc/python-apt/html/*
+Index: /usr/share/doc/python-apt-doc/html/index.html
+Files: /usr/share/doc/python-apt-doc/html/*
diff --git a/debian/python-apt-doc.docs b/debian/python-apt-doc.docs
new file mode 100644
index 00000000..f85adafd
--- /dev/null
+++ b/debian/python-apt-doc.docs
@@ -0,0 +1 @@
+build/sphinx/html/
diff --git a/debian/python-apt-doc.links b/debian/python-apt-doc.links
new file mode 100644
index 00000000..40f834f2
--- /dev/null
+++ b/debian/python-apt-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/python-apt-doc/html/_static/jquery.js
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 1bfc7c1c..a53a1ccc 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -3,4 +3,3 @@ AUTHORS
 TODO
 apt/README.apt
 data/templates/README.templates
-build/sphinx/html/
diff --git a/debian/python-apt.install b/debian/python-apt.install
index ca86ed11..29028531 100644
--- a/debian/python-apt.install
+++ b/debian/python-apt.install
@@ -4,3 +4,5 @@ usr/lib/python*/*/*/
 usr/lib/python*/*/*.egg-info
 usr/share/locale
 usr/share/python-apt
+# Install the migration helper
+utils/migrate-0.8.py usr/share/python-apt
diff --git a/debian/rules b/debian/rules
index 24d0952e..6d1f07bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,12 @@ export CFLAGS=-Wno-write-strings -DCOMPAT_0_7
 %:
 	dh --with python-central $@
 
+override_dh_auto_build:
+	dh_auto_build
+	python setup.py build_sphinx
+
 override_dh_installdocs:
 	dh_installdocs
-	ln -sf ../../../../javascript/jquery/jquery.js \
-	       debian/python-apt/usr/share/doc/python-apt/html/_static/jquery.js
 	rm -rf debian/python-apt-dbg/usr/share/doc/python-apt-dbg
 	ln -s python-apt debian/python-apt-dbg/usr/share/doc/python-apt-dbg
 
@@ -24,3 +26,6 @@ override_dh_auto_test:
 	set -e; for python in $(shell pyversions -r); do \
 		$$python tests/test_all.py -q; \
 	done;
+
+override_dh_pycentral:
+	dh_pycentral --exclude=migrate-0.8.py