Merge lp:~groldster/ubuntu/maverick/python-support/merge-from-sid-1.0.9 into lp:ubuntu/maverick/python-support

[Mikhail Turov]

1.0.9 merge from debian

[Sebastien Bacher (seb128)]

changing to merged since the new version is in maverick now

=== modified file 'debhelper/dh_pysupport'
--- debhelper/dh_pysupport	2010-05-14 12:40:10 +0000
+++ debhelper/dh_pysupport	2010-07-20 10:54:41 +0000
@@ -327,9 +327,9 @@
        	}, $tmp;
        	
        	# 5) Generate remaining dependencies
-       	foreach (@allversions) {
-       		if ($need_verdep{$_}) {
-       			addsubstvar($package, "python:Depends", "python$_");
+       	foreach my $version (@allversions) {
+       		if ($need_verdep{$version}) {
+       			addsubstvar($package, "python:Depends", "python$version");
        		}
        	}
        	if (not $have_pydep) {

=== modified file 'debian/changelog'
--- debian/changelog	2010-05-22 22:23:00 +0000
+++ debian/changelog	2010-07-20 10:54:41 +0000
@@ -1,3 +1,20 @@
+python-support (1.0.9ubuntu1) lucid; urgency=low
+
+  * Merge with Debian
+
+ -- Mikhail Turov <[e-mail]>  Tue, 20 Jul 2010 11:41:19 +0100
+
+python-support (1.0.9) unstable; urgency=low
+
+  * dh_pysupport: generates correct dependencies if multiple packages need
+    pythonX.Y (closes: #576517, thanks to Jakub Wilk for the patch)
+  * update-python-modules:
+    - remove /usr/lib/pymodules files symlinked to /usr/share/pyshared that
+      no longer belong to any python-support based package
+    - doesn't raise string exceptions anymore (closes: #585332)
+
+ -- Piotr Ożarowski <[e-mail]>  Sun, 27 Jun 2010 15:12:52 +0200
+
 python-support (1.0.8ubuntu2) maverick; urgency=low
 
   * Drop leftover .bzr*.

=== added file 'tests/testparseversions.pyc'
Binary files tests/testparseversions.pyc	1970-01-01 00:00:00 +0000 and tests/testparseversions.pyc	2010-07-20 10:54:41 +0000 differ
=== modified file 'update-python-modules'
--- update-python-modules	2010-05-14 12:40:10 +0000
+++ update-python-modules	2010-07-20 10:54:41 +0000
@@ -235,7 +235,7 @@
                 elif os.path.isdir(path):
                     self[name] = SharedDirList (path)
                 else:
-                    raise "[Internal Error] I don't know what to do with this path: %s"%path
+                    raise Exception("[Internal Error] I don't know what to do with this path: %s"%path)
         return dict.__getitem__(self, name)
 
 
@@ -316,7 +316,10 @@
               removed = True
             break
         else:
-          warning("WARNING: %s is linked but does not belong to any package."%srcfile)
+          # Remove files provided by packages that do not use python-support anymore
+          debug("remove "+abspath)
+          os.remove(abspath)
+          removed = True
         if removed:
           # Do not go further, the file was removed
           continue