[Python-modules-commits] r5474 - in packages/ipython/trunk/debian (changelog ipython.sh rules)

[piotr at users.alioth.debian.org]

    Date: Saturday, May 24, 2008 @ 20:21:57
  Author: piotr
Revision: 5474

Replace /usr/bin/ipython with a shell script which detects desired Python
version before invoking IPython. Package depends on default Python
version only again (Closes: #476661)

Added:
  packages/ipython/trunk/debian/ipython.sh
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2008-05-24 20:03:18 UTC (rev 5473)
+++ packages/ipython/trunk/debian/changelog	2008-05-24 20:21:57 UTC (rev 5474)
@@ -8,6 +8,11 @@
     - removed Suggests on python-numeric and added for python-numpy (Closes:
       #478449)
 
+  [ Piotr Ożarowski ]
+  * Replace /usr/bin/ipython with a shell script which detects desired Python
+    version before invoking IPython. Package depends on default Python
+    version only again (Closes: #476661)
+
  -- Sandro Tosi <matrixhasu at gmail.com>  Tue, 29 Apr 2008 19:40:01 +0200
 
 ipython (0.8.2.dfsg-2) unstable; urgency=low

Added: packages/ipython/trunk/debian/ipython.sh
===================================================================
--- packages/ipython/trunk/debian/ipython.sh	                        (rev 0)
+++ packages/ipython/trunk/debian/ipython.sh	2008-05-24 20:21:57 UTC (rev 5474)
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+# determine desired Python version from filename
+VERSION="${0##*ipython}"
+
+if [ ! -f /usr/bin/python$VERSION ]
+then
+	echo "Please install python$VERSION package" >&2
+	exit 1
+else
+	exec python$VERSION -c "import sys; sys.argv[0] = 'ipython$VERSION'; import IPython; IPython.Shell.start().mainloop()" $@
+fi


Property changes on: packages/ipython/trunk/debian/ipython.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2008-05-24 20:03:18 UTC (rev 5473)
+++ packages/ipython/trunk/debian/rules	2008-05-24 20:21:57 UTC (rev 5474)
@@ -13,14 +13,13 @@
 	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/README_Windows.txt
 	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/pycon.ico
 
+	install -m 755 debian/ipython.sh $(CURDIR)/debian/ipython/usr/bin/ipython
 	# add wrapper scripts for all python versions
 	set -e ;\
 	for pyvers in $(PYVERS); do \
-	    sed "1s|bin/python|bin/python$$pyvers|" $(CURDIR)/debian/ipython/usr/bin/ipython > \
-	                                            $(CURDIR)/debian/ipython/usr/bin/ipython$$pyvers ;\
-	    ln -s ipython.1.gz $(CURDIR)/debian/ipython/usr/share/man/man1/ipython$$pyvers.1.gz ;\
+	    dh_link /usr/bin/ipython /usr/bin/ipython$$pyvers;\
+	    dh_link /usr/share/man/man1/ipython.1.gz /usr/share/man/man1/ipython$$pyvers.1.gz; \
 	done
-	chmod 755 $(CURDIR)/debian/ipython/usr/bin/ipython*	
 
 	# change permission on scripts
 	chmod a-x $(CURDIR)/debian/ipython/usr/share/doc/ipython/examples/*