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

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

    Date: Thursday, May 17, 2012 @ 13:23:33
  Author: jtaylor-guest
Revision: 21796

use dh-linktree to link jquery-ui themes

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-05-17 13:17:28 UTC (rev 21795)
+++ packages/ipython/trunk/debian/changelog	2012-05-17 13:23:33 UTC (rev 21796)
@@ -9,8 +9,9 @@
     allow running 2to3 in parallel. Thanks to Jakub Wilk for the patch
   * add full-qt-imports.patch: (Closes: #671363)
     avoids choosing an incomplete qt version if a full one is available
+  * use dh-linktree to link jquery-ui themes
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Mon, 14 May 2012 22:17:17 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 17 May 2012 14:32:19 +0200
 
 ipython (0.12.1+dfsg-1) unstable; urgency=low
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2012-05-17 13:17:28 UTC (rev 21795)
+++ packages/ipython/trunk/debian/control	2012-05-17 13:23:33 UTC (rev 21796)
@@ -5,7 +5,9 @@
 Uploaders: Stephan Peijnik <debian at sp.or.at>,
            Julian Taylor <jtaylor.debian at googlemail.com>
 Build-Depends: debhelper (>= 7.3.13)
-Build-Depends-Indep: graphviz,
+Build-Depends-Indep: dh-linktree,
+                     graphviz,
+                     libjs-jquery-ui,
                      python-all (>= 2.6.6-3~),
                      python-argparse,
                      python-configobj,

Modified: packages/ipython/trunk/debian/ipython-notebook-common.links
===================================================================
--- packages/ipython/trunk/debian/ipython-notebook-common.links	2012-05-17 13:17:28 UTC (rev 21795)
+++ packages/ipython/trunk/debian/ipython-notebook-common.links	2012-05-17 13:23:33 UTC (rev 21796)
@@ -2,16 +2,4 @@
 /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
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_888888_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_888888_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_222222_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_222222_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_cd0a0a_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_cd0a0a_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_2e83ff_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_2e83ff_256x240.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-/usr/share/javascript/jquery-ui/themes/smoothness/images/ui-icons_454545_256x240.png usr/share/ipython/notebook/static/jquery/css/themes/smoothness/images/ui-icons_454545_256x240.png
+# images handled by dh_linktree

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2012-05-17 13:17:28 UTC (rev 21795)
+++ packages/ipython/trunk/debian/rules	2012-05-17 13:23:33 UTC (rev 21796)
@@ -72,6 +72,9 @@
 		--exclude=tests
 	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
 
 	mkdir -p $(CURDIR)/debian/ipython/usr/share/icons/hicolor/scalable/apps/
 	cp IPython/frontend/qt/console/resources/icon/IPythonConsole.svg \