merge mvo branch, upload to experimental

4 files changed, 38 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index f51cb07a..a80a9b64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+python-apt (0.7.9~exp1) experimental; urgency=low
+
+  * 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
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Dec 2008 14:29:47 +0100
+
 python-apt (0.7.8) unstable; urgency=low
 
   [ Michael Vogt ]
diff --git a/debian/control b/debian/control
index 1303dc6c..b738231f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Priority: optional
 Replaces: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
 Conflicts: python2.3-apt (<< 0.6.18), python2.4-apt (<< 0.6.18)
 Provides: ${python:Provides}
-Suggests: python-apt-dbg
+Suggests: python-apt-dbg, python-gtk2, python-vte
 XB-Python-Version: ${python:Versions}
 Description: Python interface to libapt-pkg
  The apt_pkg Python interface will provide full access to the internal 
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index 208050c5..f3c87fdc 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -1,3 +1,4 @@
 README
 apt/README.apt
 data/templates/README.templates
+html/
diff --git a/debian/rules b/debian/rules
index c8aff2f9..adaad2a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,9 @@ build/python-apt-dbg::
 	  python$$i-dbg ./setup.py build; \
 	done
 
+build/python-apt::
+	pydoc -w
+
 install/python-apt-dbg::
 	for i in $(cdbs_python_build_versions); do \
 	  python$$i-dbg ./setup.py install --root $(CURDIR)/debian/python-apt-dbg; \