* merged from debian/unstable

* Remaining changes:
  - data/templates/Ubuntu.info: gutsy repository information
  - set Maintainer field to ubuntu
* build against the new apt
* support for new "aptsources" pythn module
  (thanks to Sebastian Heinlein) 
* merged support for translated package descriptions
* merged support for automatic removal of unused dependencies
* merged http://glatzor.de/bzr/python-apt/sebi:
  - this means that the new aptsources modules is available
* support translated pacakge descriptions
* support automatic dependency information
* python/apt_pkgmodule.cc:
  - added pkgCache::State::PkgCurrentState enums
* python/pkgrecords.cc:
  - added SourceVer

4 files changed, 50 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index b564ff9a..b97ecab2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,45 @@
+python-apt (0.7.2ubuntu1) gutsy; urgency=low
+
+  * merged from debian/unstable
+  * Remaining changes:
+    - data/templates/Ubuntu.info: gutsy repository information
+    - set Maintainer field to ubuntu
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jun 2007 12:08:49 +0200
+
+python-apt (0.7.2) unstable; urgency=low
+
+  * build against the new apt
+  * support for new "aptsources" pythn module
+    (thanks to Sebastian Heinlein) 
+  * merged support for translated package descriptions
+  * merged support for automatic removal of unused dependencies
+
+ -- Michael Vogt <mvo@debian.org>  Sun, 10 Jun 2007 20:13:38 +0200
+
+python-apt (0.7.1) experimental; urgency=low
+
+  * merged http://glatzor.de/bzr/python-apt/sebi:
+    - this means that the new aptsources modules is available
+
+ -- Michael Vogt <mvo@debian.org>  Mon, 14 May 2007 13:33:42 +0200
+
+python-apt (0.7.0) experimental; urgency=low
+
+  * support translated pacakge descriptions
+  * support automatic dependency information
+
+ -- Michael Vogt <mvo@debian.org>  Wed,  2 May 2007 18:41:53 +0200
+
+python-apt (0.6.22) unstable; urgency=low
+
+  * python/apt_pkgmodule.cc:
+    - added pkgCache::State::PkgCurrentState enums
+  * python/pkgrecords.cc:
+    - added SourceVer
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 23 May 2007 09:44:03 +0200
+
 python-apt (0.6.21ubuntu1) gutsy; urgency=low
 
   [Michael Vogt]
diff --git a/debian/control b/debian/control
index 2a344320..b97dd78f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,13 @@
 Source: python-apt
 Section: python
 Priority: optional
-Maintainer: Michael Vogt <mvo@ubuntu.com>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 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
+Standards-Version: 3.7.2.2
 XS-Python-Version: all
-Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.6.46.4ubuntu8), apt-utils, python-all-dev, python-distutils-extra, cdbs, python-central (>= 0.5), python-all-dbg
-XS-Vcs-Bzr: http://launchpad.net/~ubuntu-core-dev/python-apt/ubuntu
+Build-Depends: debhelper (>= 5.0.37.1), libapt-pkg-dev (>= 0.7.0), apt-utils, python-all-dev, python-distutils-extra, cdbs, python-central (>= 0.5), python-all-dbg
+XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/python-apt/ubuntu/
 
 Package: python-apt
 Architecture: any
diff --git a/python/pkgrecords.cc b/python/pkgrecords.cc
index 4a5556f2..466a2f30 100644
--- a/python/pkgrecords.cc
+++ b/python/pkgrecords.cc
@@ -67,6 +67,8 @@ static PyObject *PkgRecordsAttr(PyObject *Self,char *Name)
 	 return CppPyString(Struct.Last->SHA1Hash());
       else if (strcmp("SourcePkg",Name) == 0)
 	 return CppPyString(Struct.Last->SourcePkg());
+      else if (strcmp("SourceVer",Name) == 0)
+	 return CppPyString(Struct.Last->SourceVer());
       else if (strcmp("Maintainer",Name) == 0)
 	 return CppPyString(Struct.Last->Maintainer());
       else if (strcmp("ShortDesc",Name) == 0)
diff --git a/tests/pkgrecords.py b/tests/pkgrecords.py
index 8bfe4b82..d0616d29 100644
--- a/tests/pkgrecords.py
+++ b/tests/pkgrecords.py
@@ -21,6 +21,8 @@ def main():
 			#print "no available version, cruft"
 			continue
 		version = depcache.GetCandidateVer(pkg)
+		if not version:
+			continue
 		file, index = version.FileList.pop(0)
 		if records.Lookup((file,index)):
 			#print records.FileName