diff --git a/debian/changelog b/debian/changelog index a06216746a626a3f62e1c539c466491f5b2532aa..fb6cda4c155e4c0482b10758e8a6f8eec8185307 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -python-defaults (2.7.3-3) UNRELEASED; urgency=low +python-defaults (2.7.3-3) unstable; urgency=low [ Piotr Ożarowski ] * dh_python2: @@ -8,8 +8,6 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low python3-* ones - generates correct "python (<< 2.X)" dependencies for packages with private Python extensions (typo fixed) - - TODO: parse interpreter version number from --shebang option and add - apropriate dependency/rt* script arguments * pyversions.py: fix parsing DEBPYTHON_SUPPORTED env. variable (versions should be separated using comma, as in debian_defaults config file) @@ -18,7 +16,7 @@ python-defaults (2.7.3-3) UNRELEASED; urgency=low * debian/python.{pre,post}rm.in: Handle purge command the same way as remove (thanks to Mitsuya Shibata for the bug report) - -- Piotr Ożarowski <piotr@debian.org> Fri, 31 Aug 2012 18:06:26 +0200 + -- Piotr Ożarowski <piotr@debian.org> Sun, 21 Oct 2012 22:40:55 +0200 python-defaults (2.7.3-2) unstable; urgency=low diff --git a/debpython/tools.py b/debpython/tools.py index 7cd6e27d398df042e098e9f50092969acf49ce59..bab780f6243dc7ddadb005e0bc16382fa268a0be 100644 --- a/debpython/tools.py +++ b/debpython/tools.py @@ -33,7 +33,7 @@ from debpython.version import RANGE_PATTERN, getver, get_requested_versions log = logging.getLogger(__name__) EGGnPTH_RE = re.compile(r'(.*?)(-py\d\.\d(?:-[^.]*)?)?(\.egg-info|\.pth)$') -SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(2\.\d+)?(?:-dbg)?)(?:\s(.*))?$') +SHEBANG_RE = re.compile(r'^#!\s*(.*?/bin/.*?)(python(2\.\d+)?(?:-dbg)?)(?:\s(.*))?[$\r\n].*') SHAREDLIB_RE = re.compile(r'NEEDED.*libpython(\d\.\d)') INSTALL_RE = re.compile(r""" (?P<pattern>.+?) # file pattern