[Python-modules-commits] r22143 - in packages/cairosvg/trunk/debian (3 files)

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

    Date: Tuesday, June 12, 2012 @ 12:15:50
  Author: fladi-guest
Revision: 22143

Extend patch description and use "setup.py build -e" to specify interpreter.

Modified:
  packages/cairosvg/trunk/debian/changelog
  packages/cairosvg/trunk/debian/patches/fix_setup.patch
  packages/cairosvg/trunk/debian/rules

Modified: packages/cairosvg/trunk/debian/changelog
===================================================================
--- packages/cairosvg/trunk/debian/changelog	2012-06-12 11:39:18 UTC (rev 22142)
+++ packages/cairosvg/trunk/debian/changelog	2012-06-12 12:15:50 UTC (rev 22143)
@@ -2,4 +2,4 @@
 
   * Initial release (Closes: #676344).
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 06 Jun 2012 14:31:35 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 11 Jun 2012 22:11:46 +0200

Modified: packages/cairosvg/trunk/debian/patches/fix_setup.patch
===================================================================
--- packages/cairosvg/trunk/debian/patches/fix_setup.patch	2012-06-12 11:39:18 UTC (rev 22142)
+++ packages/cairosvg/trunk/debian/patches/fix_setup.patch	2012-06-12 12:15:50 UTC (rev 22143)
@@ -1,8 +1,10 @@
 Description: use simple import to get version information.
- Instead of reading the __init__.py file and extracting the version using a regular 
- expression use a simple import to get the version string.
+ Instead of reading the __init__.py file and extracting the version using as
+ regular expression use a simple import to get the version string.
+ The method used by upstream fails with a UnicodeDecodeError when used with 
+ python3.
 Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2012-06-06
+Last-Update: 2012-06-11
 Forwarded: no
 
 --- a/setup.py

Modified: packages/cairosvg/trunk/debian/rules
===================================================================
--- packages/cairosvg/trunk/debian/rules	2012-06-12 11:39:18 UTC (rev 22142)
+++ packages/cairosvg/trunk/debian/rules	2012-06-12 12:15:50 UTC (rev 22143)
@@ -12,9 +12,12 @@
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
 	set -e; \
-	for py in $(PYVERS) $(PY3VERS); do \
-		$$py -B setup.py build; \
+	for py in $(PYVERS); do \
+		$$py -B setup.py build -e /usr/bin/python; \
 	done
+	for py in $(PY3VERS); do \
+		$$py -B setup.py build -e /usr/bin/python3; \
+	done
 
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
@@ -37,9 +40,7 @@
 		                      --install-layout deb; \
 	done
 	mv debian/python-cairosvg/usr/bin/cairosvg debian/python-cairosvg/usr/bin/cairosvg-py2
-	#sed -i '1{s,\.[0-9]$$,,}' debian/python-cairosvg/usr/bin/cairosvg-py2
 	mv debian/python3-cairosvg/usr/bin/cairosvg debian/python3-cairosvg/usr/bin/cairosvg-py3
-	#sed -i '1{s,\.[0-9]$$,,}' debian/python3-cairosvg/usr/bin/cairosvg-py3
 
 .PHONY: override_dh_installman
 override_dh_installman: