[Python-modules-commits] r27104 - in packages/ipython/trunk/debian (3 files)

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

    Date: Tuesday, January 7, 2014 @ 21:56:45
  Author: jtaylor-guest
Revision: 27104

use packaged highlight.js

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

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2014-01-07 15:44:38 UTC (rev 27103)
+++ packages/ipython/trunk/debian/control	2014-01-07 21:56:45 UTC (rev 27104)
@@ -9,6 +9,7 @@
                      fonts-font-awesome,
                      graphviz,
                      libc-bin (>= 2.13-1~),
+                     libjs-highlight,
                      libjs-jquery-ui,
                      libjs-marked,
                      node-less,
@@ -137,6 +138,7 @@
 Package: ipython-notebook-common
 Architecture: all
 Depends: fonts-font-awesome,
+         libjs-highlight,
          libjs-jquery (>= 1.7),
          libjs-jquery-ui,
          libjs-marked,

Modified: packages/ipython/trunk/debian/ipython-notebook-common.links
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.links	2014-01-07 15:44:38 UTC (rev 27103)
+++ packages/ipython/trunk/debian/ipython-notebook-common.links	2014-01-07 21:56:45 UTC (rev 27104)
@@ -1 +1,3 @@
 usr/share/javascript/marked/marked.min.js usr/share/ipython/notebook/static/components/marked/lib/marked.js
+usr/share/javascript/highlight/highlight.js usr/share/ipython/notebook/static/components/highlight.js/build/highlight.pack.js
+

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2014-01-07 15:44:38 UTC (rev 27103)
+++ packages/ipython/trunk/debian/rules	2014-01-07 21:56:45 UTC (rev 27104)
@@ -85,7 +85,6 @@
 	rm -rf $(NB)/components/less.js/
 
 	rm -rf $(NB)/components/highlight.js/
-	install -D IPython/html/static/components/highlight.js/src/highlight.js $(NB)/components/highlight.js/build/highlight.pack.js
 
 	rm -rf $(NB)/components/requirejs/
 	install -D IPython/html/static/components/requirejs/require.js $(NB)/components/requirejs/require.js
@@ -97,11 +96,6 @@
 	sed -e "s/ipython/ipython3/" -e "s/IPython/IPython3/" \
 	    examples/core/ipython-qtconsole.desktop > debian/ipython3-qtconsole/usr/share/applications/ipython3-qtconsole.desktop
 
-	# jquery-ui-themes provides more in javascript/jquery-ui-themes (not available in 12.04)
-	# 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/qt/console/resources/icon/IPythonConsole.svg \
 	  $(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/ipython.svg