[Python-modules-commits] r6313 - in packages/ipython/trunk/debian (5 files)

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

    Date: Saturday, August 23, 2008 @ 18:39:14
  Author: sez-guest
Revision: 6313

remove embedded jquery.js; fix path import (closes 486923)

Added:
  packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/patches/00list
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2008-08-23 17:46:15 UTC (rev 6312)
+++ packages/ipython/trunk/debian/changelog	2008-08-23 18:39:14 UTC (rev 6313)
@@ -1,3 +1,11 @@
+ipython (0.8.4-2) UNRELEASED; urgency=low
+
+  [ Serafeim Zanikolas ]
+  * Remove embedded copy of jquery.js and instead depend on libjs-jquery.
+  * Fix import of path in ipipe.py (Closes: #486923).
+
+ -- Serafeim Zanikolas <serzan at hellug.gr>  Tue, 19 Aug 2008 20:58:31 +0100
+
 ipython (0.8.4-1) unstable; urgency=low
 
   [ Norbert Tretkowski ]

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2008-08-23 17:46:15 UTC (rev 6312)
+++ packages/ipython/trunk/debian/control	2008-08-23 18:39:14 UTC (rev 6313)
@@ -12,7 +12,7 @@
 
 Package: ipython
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-pexpect
+Depends: ${python:Depends}, ${misc:Depends}, python-pexpect, libjs-jquery
 Conflicts: python2.3-ipython, python2.4-ipython, ipython-common
 Replaces: python2.3-ipython, python2.4-ipython, ipython-common
 Suggests: python-profiler, python-numpy, python-matplotlib

Modified: packages/ipython/trunk/debian/patches/00list
===================================================================
--- packages/ipython/trunk/debian/patches/00list	2008-08-23 17:46:15 UTC (rev 6312)
+++ packages/ipython/trunk/debian/patches/00list	2008-08-23 18:39:14 UTC (rev 6313)
@@ -1,2 +1,3 @@
 03_ipy_gnuglobal
 04_remove_shebang
+05_fix_path_import

Added: packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch
===================================================================
--- packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch	2008-08-23 18:39:14 UTC (rev 6313)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05_fix_path_import.dpatch by  <Serafeim Zanikolas <serzan at hellug.gr>>
+##
+## DP: fix path import
+
+ at DPATCH@
+diff -ru ipython-0.8.4.orig/IPython/Extensions/ipipe.py ipython-0.8.4/IPython/Extensions/ipipe.py
+--- ipython-0.8.4.orig/IPython/Extensions/ipipe.py	2008-05-31 23:31:42.000000000 +0100
++++ ipython-0.8.4/IPython/Extensions/ipipe.py	2008-08-19 21:02:53.000000000 +0100
+@@ -124,7 +124,7 @@
+ 
+ from IPython.external import simplegeneric
+ 
+-import path
++from IPython.external import path
+ 
+ try:
+     from IPython import genutils, generics


Property changes on: packages/ipython/trunk/debian/patches/05_fix_path_import.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2008-08-23 17:46:15 UTC (rev 6312)
+++ packages/ipython/trunk/debian/rules	2008-08-23 18:39:14 UTC (rev 6313)
@@ -12,6 +12,9 @@
 	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/ChangeLog
 	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/README_Windows.txt
 	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/pycon.ico
+	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/_static/jquery.js
+	ln -s /usr/share/javascript/jquery/jquery.js \
+		$(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/_static/
 
 	# add wrapper scripts for all python versions
 	set -e ;\