[Python-modules-commits] r23743 - in packages/pytest/trunk/debian (4 files)

[laarmen-guest at users.alioth.debian.org]

    Date: Wednesday, March 20, 2013 @ 22:33:20
  Author: laarmen-guest
Revision: 23743

* Fix the version detection regexp to be less inclusive (Closes: #703351)
* Adjust the shebang replacement regexp in postinst. Thanks to Roderich Schupp.

Modified:
  packages/pytest/trunk/debian/changelog
  packages/pytest/trunk/debian/python-pytest.postinst
  packages/pytest/trunk/debian/python3-pytest.postinst
  packages/pytest/trunk/debian/rules

Modified: packages/pytest/trunk/debian/changelog
===================================================================
--- packages/pytest/trunk/debian/changelog	2013-03-20 21:35:20 UTC (rev 23742)
+++ packages/pytest/trunk/debian/changelog	2013-03-20 22:33:20 UTC (rev 23743)
@@ -1,3 +1,10 @@
+pytest (2.3.4-1~exp2) UNRELEASED; urgency=low
+
+  * Fix the version detection regexp to be less inclusive (Closes: #703351)
+  * Adjust the shebang replacement regexp in postinst. Thanks to Roderich Schupp.
+
+ -- Simon Chopin <chopin.simon at gmail.com>  Wed, 20 Mar 2013 12:49:01 +0100
+
 pytest (2.3.4-1~exp1) experimental; urgency=low
 
   * Upload new upstream release to experimental (Closes: #699312)

Modified: packages/pytest/trunk/debian/python-pytest.postinst
===================================================================
--- packages/pytest/trunk/debian/python-pytest.postinst	2013-03-20 21:35:20 UTC (rev 23742)
+++ packages/pytest/trunk/debian/python-pytest.postinst	2013-03-20 22:33:20 UTC (rev 23743)
@@ -19,7 +19,7 @@
         for version in `pyversions -vi`; do
             if [ $version ]; then
                 cp /usr/bin/py.test /usr/bin/py.test-$version
-                sed -i "s,#!/usr/bin/python,#!/usr/bin/python$version," "/usr/bin/py.test-$version"
+                sed -i "s,#! */usr/bin/python,#!/usr/bin/python$version," "/usr/bin/py.test-$version"
             fi
         done
     ;;

Modified: packages/pytest/trunk/debian/python3-pytest.postinst
===================================================================
--- packages/pytest/trunk/debian/python3-pytest.postinst	2013-03-20 21:35:20 UTC (rev 23742)
+++ packages/pytest/trunk/debian/python3-pytest.postinst	2013-03-20 22:33:20 UTC (rev 23743)
@@ -20,7 +20,7 @@
         for version in `py3versions -vi`; do
             if [ $version ]; then
                 cp /usr/bin/py.test-3 /usr/bin/py.test-$version
-                sed -i "s,#!/usr/bin/python3,#!/usr/bin/python$version," "/usr/bin/py.test-$version"
+                sed -i "s,#! */usr/bin/python3,#!/usr/bin/python$version," "/usr/bin/py.test-$version"
             fi
         done
     ;;

Modified: packages/pytest/trunk/debian/rules
===================================================================
--- packages/pytest/trunk/debian/rules	2013-03-20 21:35:20 UTC (rev 23742)
+++ packages/pytest/trunk/debian/rules	2013-03-20 22:33:20 UTC (rev 23743)
@@ -7,7 +7,7 @@
 PYVERS :=  $(shell pyversions -vr)
 PY3VERS := $(shell py3versions -vr)
 
-UPSTREAM = $(shell dpkg-parsechangelog | grep Version | sed 's/Version: \(.*\)-.*/\1/' )
+UPSTREAM = $(shell dpkg-parsechangelog | egrep "^Version: "| sed 's/Version: \(.*\)-.*/\1/' )
 
 %:
 	dh $@ --with python2,python3,sphinxdoc