[Python-modules-commits] r22378 - in packages/ipython/trunk/debian (4 files)

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

    Date: Saturday, June 30, 2012 @ 13:23:46
  Author: jtaylor-guest
Revision: 22378

drop libjs-jquery-ui dependency, use the embedded development branch

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/ipython-notebook-common.links
  packages/ipython/trunk/debian/rules

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-06-30 13:23:33 UTC (rev 22377)
+++ packages/ipython/trunk/debian/changelog	2012-06-30 13:23:46 UTC (rev 22378)
@@ -3,8 +3,9 @@
   * New upstream release
     No repackging necessary anymore, js sources available in external
     minified variants are not installed
+  * drop libjs-jquery-ui dependency, use the embedded development branch
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 10:55:14 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 10:57:58 +0200
 
 ipython (0.12.1+dfsg-2) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2012-06-30 13:23:33 UTC (rev 22377)
+++ packages/ipython/trunk/debian/control	2012-06-30 13:23:46 UTC (rev 22378)
@@ -135,7 +135,7 @@
 
 Package: ipython-notebook-common
 Architecture: all
-Depends: libjs-jquery, libjs-jquery-ui, libjs-mathjax, ${misc:Depends}
+Depends: libjs-jquery, libjs-mathjax, ${misc:Depends}
 Replaces: ipython-notebook (<< 0.12.1-2)
 Breaks: ipython-notebook (<< 0.12.1-2)
 Description: interactive Python html notebook data package

Modified: packages/ipython/trunk/debian/ipython-notebook-common.links
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.links	2012-06-30 13:23:33 UTC (rev 22377)
+++ packages/ipython/trunk/debian/ipython-notebook-common.links	2012-06-30 13:23:46 UTC (rev 22378)
@@ -1,5 +1,12 @@
-/usr/share/javascript/jquery/jquery.js usr/share/ipython/notebook/static/jquery/js/jquery-1.6.2.min.js
-/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/ipython/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
+/usr/share/ipython/notebook/js/jquery-ui.js /usr/share/ipython/notebook/static/jquery/js/jquery-ui.min.js
 
-/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css usr/share/ipython/notebook/static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css
+/usr/share/ipython/notebook/js/jquery-ui.css /usr/share/ipython/notebook/static/jquery/css/themes/base/jquery-ui.min.css
+
+/usr/share/ipython/notebook/js/prettify.js /usr/share/ipython/notebook/static/prettify/prettify.js
+
+/usr/share/javascript/jquery/jquery.js usr/share/ipython/notebook/static/jquery/js/jquery-1.7.1.min.js
+# disabled as unpackaged dev branch is needed for 0.13
+#/usr/share/javascript/jquery-ui/jquery-ui.min.js usr/share/ipython/notebook/static/jquery/js/jquery-ui-1.8.14.custom.min.js
+
+#/usr/share/javascript/jquery-ui/css/smoothness/jquery-ui.css usr/share/ipython/notebook/static/jquery/css/themes/smoothness/jquery-ui-1.8.14.custom.css
 # images handled by dh_linktree

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2012-06-30 13:23:33 UTC (rev 22377)
+++ packages/ipython/trunk/debian/rules	2012-06-30 13:23:46 UTC (rev 22378)
@@ -72,8 +72,9 @@
 	dh_install -pipython3-qtconsole
 
 	# jquery-ui-themes provides more in javascript/jquery-ui-themes (not available in 12.04)
-	dh_linktree -v -pipython-notebook-common replace usr/share/javascript/jquery-ui/themes \
-	  usr/share/ipython/notebook/static/jquery/css/themes
+	# disabled as long as the ui dev branch is used
+	#dh_linktree -v -pipython-notebook-common replace usr/share/javascript/jquery-ui/themes \
+	#  usr/share/ipython/notebook/static/jquery/css/themes
 
 	mkdir -p $(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/
 	cp IPython/frontend/qt/console/resources/icon/IPythonConsole.svg \