Merge Ben Finney's whitespace changes (Closes: #481563)

3 files changed, 35 insertions, 34 deletions

diff --git a/debian/changelog b/debian/changelog
index cd67e51a..a44550d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,8 +27,9 @@ python-apt (0.7.9~exp2) experimental; urgency=low
     - 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)
 
- -- Julian Andres Klode <jak@debian.org>  Sat, 10 Jan 2009 00:30:19 +0100
+ -- Julian Andres Klode <jak@debian.org>  Sun, 11 Jan 2009 19:25:55 +0100
 
 python-apt (0.7.9~exp1) experimental; urgency=low
 
@@ -187,7 +188,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:
@@ -206,7 +207,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
@@ -238,7 +239,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
@@ -257,7 +258,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
 
@@ -292,7 +293,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:
@@ -322,7 +323,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:
@@ -374,40 +375,40 @@ 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.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
@@ -420,11 +421,11 @@ python-apt (0.6.16.1) unstable; 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()
@@ -451,8 +452,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
 
@@ -470,9 +471,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
@@ -485,7 +486,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
 
@@ -497,17 +498,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
@@ -583,7 +584,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
@@ -593,7 +594,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
 
@@ -623,7 +624,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 8a10091d..0cb6e215 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ 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:
  .
@@ -25,7 +25,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
@@ -33,7 +33,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