Merge from alioth.

debian/changelog

@@ -8,6 +8,7 @@ python-defaults (2.6.5-13) UNRELEASED; urgency=low
 
   [ Piotr Ożarowski ]
   * Fix documentation typo in pycompile/pycompile.1
+  * dh_python2: Add support for X-Python-Version
 
  -- Scott Kitterman <scott@kitterman.com>  Tue, 10 Aug 2010 22:27:20 -0400
 

debpython/debhelper.py

@@ -78,10 +78,11 @@ class DebHelper(object):
                                                  'uses_breaks': False}
             elif line.startswith('Source:'):
                 self.source_name = line[7:].strip()
-            elif source_section and line.startswith('XS-Python-Version:'):
-                # ignore 3.X requirements
-                self.python_version = re.compile(\
-                    ',\s>=\s*3.*').sub('', line[18:])
+            elif source_section:
+                if line.startswith('XS-Python-Version:') and not self.python_version:
+                    self.python_version = line[18:].strip()
+                if line.startswith('X-Python-Version:'):
+                    self.python_version = line[17:].strip()
         log.debug('source=%s, binary packages=%s', self.source_name, \
                                                    self.packages.keys())
 

dh_python2

@@ -446,7 +446,7 @@ def main():
         with open('debian/pyversions') as fp:
             for line in fp:
                 line = line.strip()
-                if line:
+                if line and not line.startswith('#'):
                     options.vrange = parse_vrange(line)
                     break