[Python-modules-commits] r13926 - in packages/numpy/trunk/debian (changelog control rules)

[morph at users.alioth.debian.org]

    Date: Monday, July 12, 2010 @ 21:49:55
  Author: morph
Revision: 13926

* debian/{control, rules}
  - use system-wide jquery instead of an embedded one

Modified:
  packages/numpy/trunk/debian/changelog
  packages/numpy/trunk/debian/control
  packages/numpy/trunk/debian/rules

Modified: packages/numpy/trunk/debian/changelog
===================================================================
--- packages/numpy/trunk/debian/changelog	2010-07-12 21:41:12 UTC (rev 13925)
+++ packages/numpy/trunk/debian/changelog	2010-07-12 21:49:55 UTC (rev 13926)
@@ -29,6 +29,8 @@
     - added upstream patch (r8463) to remove string exceptions; Closes: #585309
   * debian/{compat, control, rules, *.install, *.doc}
     - switch from cdbs to dh7
+  * debian/{control, rules}
+    - use system-wide jquery instead of an embedded one
 
   [ Piotr Ożarowski ]
   * debian/control: add XB-Python-Version to python-numpy-dbg package
@@ -48,7 +50,7 @@
   * Use setup.py install --install-layout; specifying --prefix installs
     into the wrong location.
 
- -- Sandro Tosi <morph at debian.org>  Mon, 12 Jul 2010 19:53:01 +0200
+ -- Sandro Tosi <morph at debian.org>  Mon, 12 Jul 2010 23:49:20 +0200
 
 python-numpy (1:1.3.0-3) unstable; urgency=low
 

Modified: packages/numpy/trunk/debian/control
===================================================================
--- packages/numpy/trunk/debian/control	2010-07-12 21:41:12 UTC (rev 13925)
+++ packages/numpy/trunk/debian/control	2010-07-12 21:49:55 UTC (rev 13926)
@@ -48,7 +48,7 @@
  This package contains the extension built for the Python debug interpreter.
 
 Package: python-numpy-doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Section: doc
 Architecture: all
 Description: NumPy documentation

Modified: packages/numpy/trunk/debian/rules
===================================================================
--- packages/numpy/trunk/debian/rules	2010-07-12 21:41:12 UTC (rev 13925)
+++ packages/numpy/trunk/debian/rules	2010-07-12 21:49:55 UTC (rev 13926)
@@ -65,6 +65,13 @@
 	# remove extra license in doc
 	rm -f debian/python-numpy-doc/usr/share/doc/python-numpy-doc/html/_sources/license.txt
 
+	# use system-wide jquery
+	rm -f debian/python-numpy-doc/usr/share/doc/python-numpy-doc/html/_static/jquery.js
+	dh_link -ppython-numpy-doc /usr/share/javascript/jquery/jquery.js /usr/share/doc/python-numpy-doc/html/_static/jquery.js
+
+override_dh_compress:
+	dh_compress -X.js
+
 override_dh_strip:
 ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip -ppython-numpy --dbg-package=python-numpy-dbg