Merge lp:~didrocks/python-distutils-extra/fix-package-detection into lp:python-distutils-extra

[Didier Roche-Tolomelli]

[Didier Roche-Tolomelli (didrocks)]

This fix some bugs like the one encountered in bug #482913 where the module only have one .py file (no directory for the module).

[lp:~didrocks/python-distutils-extra/fix-package-detection]

145. By Martin Pitt on 2009-11-17

python-mkdebian: Fix dependency detection for packages which only ship a
Python module, not a package. Thanks Didier Roche! (LP: #482913)

=== modified file 'debian/local/python-mkdebian'
--- debian/local/python-mkdebian	2009-09-11 10:33:18 +0000
+++ debian/local/python-mkdebian	2009-11-17 05:35:17 +0000
@@ -224,7 +224,9 @@
     dpkg = subprocess.Popen(['dpkg', '-L', package], stdout=subprocess.PIPE,
             stderr=subprocess.PIPE)
     out = dpkg.communicate()[0]
-    if dpkg.returncode == 0 and '/%s/__init__.py\n' % module.replace('.', '/') in out:
+    if dpkg.returncode == 0 and \
+       ('/%s/__init__.py\n' % module.replace('.', '/') in out or \
+        '/%s.py\n' % module.replace('.', '/') in out):
         return package
 
     # bigger hammer: dpkg -S for Python packages