[Python-modules-commits] r22157 - in packages/circuits/trunk/debian (changelog rules)

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

    Date: Wednesday, June 13, 2012 @ 07:50:20
  Author: eriol-guest
Revision: 22157

Fixed shebang for CLI scripts

Modified:
  packages/circuits/trunk/debian/changelog
  packages/circuits/trunk/debian/rules

Modified: packages/circuits/trunk/debian/changelog
===================================================================
--- packages/circuits/trunk/debian/changelog	2012-06-13 06:49:31 UTC (rev 22156)
+++ packages/circuits/trunk/debian/changelog	2012-06-13 07:50:20 UTC (rev 22157)
@@ -2,9 +2,9 @@
 
   * New upstream release
     - Added Python 3 support
-  * Builded python3 package
-    - circuits.bench, circuits.sniff and circuits.web are provided only for
-      the default Python version
+  * Builded Python3 package
+    - CLI tools for Python3 are named circuits.bench3, circuits.sniff3 and
+      circuits.web3
   * Added python-circuits-doc package and moved documentation and examples
     inside it
   * debian/control
@@ -63,7 +63,7 @@
   * debian/watch
     - Updated to new upstream download location (PyPI)
 
- -- Daniele Tricoli <eriol at mornie.org>  Wed, 13 Jun 2012 07:31:45 +0200
+ -- Daniele Tricoli <eriol at mornie.org>  Wed, 13 Jun 2012 09:22:19 +0200
 
 circuits (1.2.1-1) unstable; urgency=low
 

Modified: packages/circuits/trunk/debian/rules
===================================================================
--- packages/circuits/trunk/debian/rules	2012-06-13 06:49:31 UTC (rev 22156)
+++ packages/circuits/trunk/debian/rules	2012-06-13 07:50:20 UTC (rev 22157)
@@ -16,9 +16,12 @@
 
 override_dh_auto_build:
 	set -e -x; \
-	for python in $(PY2VERS) $(PY3VERS); do \
-		$$python setup.py build; \
+	for python in $(PY2VERS); do \
+		$$python setup.py build -e /usr/bin/python; \
 	done
+	for python in $(PY3VERS); do \
+		$$python setup.py build -e /usr/bin/python3; \
+	done
 
 	PYTHONPATH=. sphinx-build -N -bhtml docs/source docs/build/html
 
@@ -38,9 +41,18 @@
 	# Remove tests to not pollute namespace.
 	rm -rf debian/python*-circuits/usr/lib/python*/dist-packages/tests
 
-	# Remove scripts for Python3: provide them only for the default version.
-	rm -rf debian/python3-circuits/usr/bin/
+	# Rename scripts for Python3
+	mv debian/python3-circuits/usr/bin/circuits.bench \
+	   debian/python3-circuits/usr/bin/circuits.bench3
+	mv debian/python3-circuits/usr/bin/circuits.sniff \
+	   debian/python3-circuits/usr/bin/circuits.sniff3
+	mv debian/python3-circuits/usr/bin/circuits.web \
+	   debian/python3-circuits/usr/bin/circuits.web3
 
+	# --excutable option in build has no effect for circuits.web's entrypoint
+	sed -i '1c#!/usr/bin/python' debian/python-circuits/usr/bin/circuits.web
+	sed -i '1c#!/usr/bin/python3' debian/python3-circuits/usr/bin/circuits.web3
+
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 	# Upstream is calling directly py.test inside a Popen so, for now, tests