merge from the debian experimental branch

6 files changed, 88 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index bb41ee35..64eedcb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,49 @@
+python-apt (0.7.9~exp2) experimental; urgency=low
+
+  [ Julian Andres Klode ]
+  * apt/*.py:
+    - Almost complete cleanup of the code
+    - Remove inconsistent use of tabs and spaces (Closes: #505443)
+    - Improved documentation
+  * apt/debfile.py:
+    - Drop get*() methods, as they are deprecated and were
+      never in a stable release
+    - Make DscSrcPackage working
+  * apt/gtk/widgets.py:
+    - Fix the code and document the signals
+  * Introduce new documentation build with Sphinx
+    - Contains style Guide (Closes: #481562)
+    - debian/rules: Build the documentation here
+    - setup.py: Remove pydoc building and add new docs.
+    - debian/examples: Include examples from documentation
+    - debian/python-apt.docs:
+      + Change html/ to build/doc/html.
+      + Add build/doc/text for the text-only documentation
+  * setup.py:
+    - Only create build/data when building, not all the time
+    - Remove build/mo and build/data on clean -a
+  * debian/control:
+    - Remove the Conflicts on python2.3-apt, python2.4-apt, as
+      they are only needed for oldstable (sarge)
+    - Build-Depend on python-sphinx (>= 0.5)
+  * aptsources/distinfo.py:
+    - Allow @ in mirror urls (Closes: #478171) (LP: #223097)
+  * Merge Ben Finney's whitespace changes (Closes: #481563)
+  * Merge Ben Finney's do not use has_key() (Closes: #481878)
+  * Do not use deprecated form of raise statement (Closes: #494259)
+  * Add support for PkgRecords.SHA256Hash (Closes: #456113)
+  
+  [ Michael Vogt ]
+  * apt/package.py:
+    - fix bug in candidateInstalledSize property
+  * aptsources/distinfo.py:
+    - fix too restrictive mirror url check
+  * aptsources/distro.py:
+    - only add nearest_server and server to the mirrors if
+      they are defined
+
+ -- Julian Andres Klode <jak@debian.org>  Sun, 11 Jan 2009 20:01:59 +0100
+
 python-apt (0.7.8ubuntu1) jaunty; urgency=low
 
   * Merged python-apt consolidation branch by Sebastian
@@ -29,7 +75,7 @@ python-apt (0.7.8ubuntu1) jaunty; urgency=low
     - build html/ help of the apt and aptsources modules
       into /usr/share/doc/python-apt/html
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2008 14:30:32 +0100
+ -- Michael Vogt <mvo@debian.org>  Mon, 15 Dec 2008 14:29:47 +0100
 
 python-apt (0.7.8) unstable; urgency=low
 
@@ -360,7 +406,7 @@ python-apt (0.7.4) unstable; urgency=low
 
   * apt/debfile.py:
     - added wrapper around apt_inst.debExtract()
-    - support dictionary like access 
+    - support dictionary like access
   * apt/package.py:
     - fix apt.package.Dependency.relation initialization
   * python/apt_instmodule.cc:
@@ -379,7 +425,7 @@ python-apt (0.7.4) unstable; urgency=low
   * python/depcache.cc:
     - be more threading friendly
   * python/tag.cc
-    - support "None" as default in 
+    - support "None" as default in
       ParseSection(control).get(field, default), LP: #44470
   * python/progress.cc:
     - fix refcount problem in OpProgress
@@ -479,7 +525,7 @@ python-apt (0.7.3) unstable; urgency=low
   * doc/examples/records.py:
     - added example how to use the new Records class
   * apt/cache.py:
-    - throw FetchCancelleException, FetchFailedException, 
+    - throw FetchCancelleException, FetchFailedException,
       LockFailedException exceptions when something goes wrong
   * aptsources/distro.py:
     - generalized some code, bringing it into the Distribution
@@ -527,7 +573,7 @@ python-apt (0.7.2) unstable; urgency=low
 
   * build against the new apt
   * support for new "aptsources" pythn module
-    (thanks to Sebastian Heinlein) 
+    (thanks to Sebastian Heinlein)
   * merged support for translated package descriptions
   * merged support for automatic removal of unused dependencies
 
@@ -577,7 +623,7 @@ python-apt (0.6.21) unstable; urgency=low
     - better cdrom handling support
   * apt/package.py:
     - added candidateDependencies, installedDependencies
-    - SizeToString supports PyLong too 
+    - SizeToString supports PyLong too
     - support pkg.architecture
     - support candidateRecord, installedRecord
   * apt/cache.py:
@@ -746,7 +792,7 @@ python-apt (0.6.20) unstable; urgency=low
     - use select() when checking for statusfd (lp: #53282)
   * acknoledge NMU (closes: #378048, #373512)
   * python/apt_pkgmodule.cc:
-    - fix missing docstring (closes: #368907), 
+    - fix missing docstring (closes: #368907),
       Thanks to Josh Triplett
   * make it build against python2.5
   * python/progress.cc:
@@ -886,29 +932,29 @@ python-apt (0.6.18) unstable; urgency=low
 
 python-apt (0.6.17) unstable; urgency=low
 
-  * apt/progress.py: 
+  * apt/progress.py:
     - initialize FetchProgress.eta with the correct type
     - strip the staus str before passing it to InstallProgress.statusChanged()
-    - added InstallProgress.statusChange(pkg, percent, status) 
-    - make DumbInstallProgress a new-style class 
+    - added InstallProgress.statusChange(pkg, percent, status)
+    - make DumbInstallProgress a new-style class
       (thanks to kamion for the suggestions)
     - fix various pychecker warnings
   * apt/cache.py:
     - return useful values on Cache.update()
     - Release locks on failure (thanks to Colin Watson)
     - fix various pychecker warnings
-  * apt/package.py: 
+  * apt/package.py:
     - fix various pychecker warnings
     - check if looupRecords succeeded
     - fix bug in the return statement of _downloadable()
   * python/srcrecords.cc:
     - add "Restart" method
-    - don't run auto "Restart" before performing a Lookup 
+    - don't run auto "Restart" before performing a Lookup
     - fix the initalization (no need to pass a PkgCacheType to the records)
     - added "Index" attribute
   * python/indexfile.cc:
     - added ArchiveURI() method
-  
+
  -- Michael Vogt <mvo@debian.org>  Mon,  8 May 2006 22:34:58 +0200
 
 python-apt (0.6.16.2ubuntu9) edgy; urgency=low
@@ -989,14 +1035,14 @@ python-apt (0.6.16.2ubuntu1) dapper; urgency=low
  -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 28 Feb 2006 12:04:37 +0100
 
 python-apt (0.6.16.2) unstable; urgency=low
-  
+
   * Non-maintainer upload.
   * debian/control:
     + Replaces: python-apt (<< 0.6.11), instead of Conflicts which is not
       correct here. (closes: #308586).
 
  -- Pierre Habouzit <madcoder@debian.org>  Fri, 14 Apr 2006 19:30:51 +0200
-  
+
 python-apt (0.6.16.1) unstable; urgency=low
 
   * memleak fixed when pkgCache objects are deallocated
@@ -1021,11 +1067,11 @@ python-apt (0.6.16ubuntu1) dapper; urgency=low
 
 python-apt (0.6.16) unstable; urgency=low
 
-  * added GetPkgAcqFile to queue individual file downloads with the 
+  * added GetPkgAcqFile to queue individual file downloads with the
     system (dosn't make use of the improved pkgAcqFile yet)
   * added SourceList.GetIndexes()
   * rewrote apt.cache.update() to use the improved aquire interface
-  * apt/ API change: apt.Package.candidateOrigin returns a list of origins 
+  * apt/ API change: apt.Package.candidateOrigin returns a list of origins
     now instead of a single one
   * apt_pkg.Cdrom.Add() returns a boolean now, CdromProgress has totalSteps
   * added support for pkgIndexFile and added SourcesList.FindIndex()
@@ -1052,8 +1098,8 @@ python-apt (0.6.14) unstable; urgency=low
     (this is the job of the caller now)
   * python/srcrecords.cc:
     - support for "srcrecords.Files" added
-    - always run "Restart" before performing a Lookup 
-  * export locking via: GetLock(),PkgSystem{Lock,UnLock} 
+    - always run "Restart" before performing a Lookup
+  * export locking via: GetLock(),PkgSystem{Lock,UnLock}
   * apt/cache.py:
     - added  __iter__ to make "for pkg in apt.Cache:" stuff possible
 
@@ -1071,9 +1117,9 @@ python-apt (0.6.13) unstable; urgency=low
   * native apt/ python directory added that contains
     a more pythonic interface to apt_pkg
   * made the apt/ python code PEP08 conform
-  * python exceptions return the apt error message now 
+  * python exceptions return the apt error message now
     (thanks to Chris Halls for the patch)
-  
+
  -- Michael Vogt <mvo@debian.org>  Fri,  5 Aug 2005 10:30:31 +0200
 
 python-apt (0.6.12.2) unstable; urgency=low
@@ -1086,7 +1132,7 @@ python-apt (0.6.12.1) unstable; urgency=low
 
    * rebuild against the latest apt
 
- -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2005 18:29:57 +0200 
+ -- Michael Vogt <mvo@debian.org>  Tue, 28 Jun 2005 18:29:57 +0200
 
 python-apt (0.6.12ubuntu1) breezy; urgency=low
 
@@ -1098,17 +1144,17 @@ python-apt (0.6.12ubuntu1) breezy; urgency=low
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 12 May 2005 11:34:05 +0200
 
 python-apt (0.6.12) breezy; urgency=low
-  
+
   * added a tests/ directory
   * added tests/pkgsrcrecords.py that will check if the pkgsrcrecords
     interface does not segfault
   * new native python "apt" interface that hides the details of apt_pkg
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  6 May 2005 10:11:52 +0200
-  
+
 python-apt (0.6.11) experimental; urgency=low
 
-  * fixed some reference count problems in the depcache and 
+  * fixed some reference count problems in the depcache and
     pkgsrcrecords code
   * DepCache.Init() is never called implicit now
   * merged with python-apt tree from Greek0@gmx.net--2005-main
@@ -1184,7 +1230,7 @@ python-apt (0.5.8) unstable; urgency=low
 
 python-apt (0.5.5.2) unstable; urgency=low
 
-  * Add myself to Uploaders so that bugs don't get tagged as NMU-fixed anymore 
+  * Add myself to Uploaders so that bugs don't get tagged as NMU-fixed anymore
   * Initial support for working with source packages (Closes: #199716)
 
  -- Matt Zimmerman <mdz@debian.org>  Tue, 22 Jul 2003 22:20:00 -0400
@@ -1194,7 +1240,7 @@ python-apt (0.5.5.1) unstable; urgency=low
   * DepIterator::GlobOr increments the iterator; don't increment it again.
     This caused every other dependency to be skipped (Closes: #195805)
   * Avoid a null pointer dereference when calling keys() on an empty
-    configuration (Closes: #149380) 
+    configuration (Closes: #149380)
 
  -- Matt Zimmerman <mdz@debian.org>  Mon,  2 Jun 2003 23:18:53 -0400
 
@@ -1224,7 +1270,7 @@ python-apt (0.5.4.4) unstable; urgency=low
     Closes: #157773
 
  -- Matt Zimmerman <mdz@debian.org>  Tue, 27 Aug 2002 19:22:10 -0400
-  
+
 python-apt (0.5.4.3) unstable; urgency=low
 
   * #include <new> in python/generic.h so that we can build on ia64, which
diff --git a/debian/control b/debian/control
index a9156b7b..abce7569 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.10), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.10), apt-utils, python-all-dev, python-distutils-extra (>= 1.9.0), cdbs, python-central (>= 0.5), python-all-dbg, python-sphinx (>= 0.5)
 XS-Original-Vcs-Bzr: http://bzr.debian.org/apt/python-apt/debian-sid
 Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
 
@@ -14,13 +14,11 @@ Package: python-apt
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, lsb-release
 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, 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 
+ 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, such as:
  .
@@ -29,7 +27,7 @@ Description: Python interface to libapt-pkg
   - Parsing of Debian package control files, and other files with a
     similar structure
  .
- The included 'aptsources' Python interface provides an abstraction of 
+ The included 'aptsources' Python interface provides an abstraction of
  the sources.list configuration on the repository and the distro level.
 
 Package: python-apt-dbg
@@ -37,7 +35,7 @@ Priority: extra
 Architecture: any
 Depends: python-dbg, python-apt (= ${Source-Version}), ${shlibs:Depends}
 Description: Python interface to libapt-pkg (debug extension)
- The apt_pkg Python interface will provide full access to the internal 
+ 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.
  .
diff --git a/debian/copyright b/debian/copyright
index 1e310354..f8463185 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
-APT is free software; you can redistribute them and/or modify them under 
-the terms of the GNU General Public License as published by the Free Software 
-Foundation; either version 2 of the License, or (at your option) any later 
+APT is free software; you can redistribute them and/or modify them under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
 version.
 
 On Debian systems, a copy of the GNU General Public License can be
diff --git a/debian/examples b/debian/examples
index 80a386c8..e4a93ea1 100644
--- a/debian/examples
+++ b/debian/examples
@@ -1 +1,2 @@
 doc/examples/*.py
+doc/source/examples/*.py
diff --git a/debian/python-apt.docs b/debian/python-apt.docs
index f3c87fdc..6ba083f5 100644
--- a/debian/python-apt.docs
+++ b/debian/python-apt.docs
@@ -1,4 +1,5 @@
 README
 apt/README.apt
 data/templates/README.templates
-html/
+build/doc/html/
+build/doc/text/
diff --git a/debian/rules b/debian/rules
index c8aff2f9..90b48cda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ include /usr/share/cdbs/1/class/python-distutils.mk
 
 PKG=python-apt
 DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
+DEB_COMPRESS_EXCLUDE:=.html .js _static/* _sources/* _sources/*/* .inv
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
 build/python-apt-dbg::
@@ -21,6 +22,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; \