[Python-modules-commits] r19267 - in packages/ipython/trunk/debian (ipython-doc.links rules)

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

    Date: Saturday, November 12, 2011 @ 18:02:52
  Author: jtaylor-guest
Revision: 19267

link jquery.js from libjs-jquery

Added:
  packages/ipython/trunk/debian/ipython-doc.links
Modified:
  packages/ipython/trunk/debian/rules

Added: packages/ipython/trunk/debian/ipython-doc.links
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.links	                        (rev 0)
+++ packages/ipython/trunk/debian/ipython-doc.links	2011-11-12 18:02:52 UTC (rev 19267)
@@ -0,0 +1 @@
+/usr/share/javascript/jquery/jquery.js usr/share/doc/ipython/html/_static/jquery.js

Modified: packages/ipython/trunk/debian/rules
===================================================================
--- packages/ipython/trunk/debian/rules	2011-11-12 18:02:39 UTC (rev 19266)
+++ packages/ipython/trunk/debian/rules	2011-11-12 18:02:52 UTC (rev 19267)
@@ -17,7 +17,6 @@
 override_dh_auto_build:
 	dh_auto_build -- --executable '/usr/bin/env python'
 	PYTHONPATH=$(CURDIR) $(MAKE) -C $(CURDIR)/docs html
-	rm -f $(CURDIR)/docs/build/html/_static/jquery.js
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
@@ -57,10 +56,6 @@
 
 	# remove test suite script
 	rm $(CURDIR)/debian/ipython/usr/bin/iptest
-	# remove documentation
-	rm $(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/html/_static/jquery.js
-	ln -s /usr/share/javascript/jquery/jquery.js \
-		$(CURDIR)/debian/ipython/usr/share/doc/ipython/manual/html/_static/
 
 	# add wrapper scripts for all python versions
 	set -e ;\
@@ -88,6 +83,8 @@
 	dh_installdocs -pipython-parallel --link-doc=ipython
 	dh_installdocs -pipython-qtconsole --link-doc=ipython
 	dh_installdocs -pipython-doc --link-doc=ipython
+	# remove jquery, will be linked
+	rm $(CURDIR)/debian/ipython-doc/usr/share/doc/ipython/html/_static/jquery.js
 
 override_dh_installexamples:
 	dh_installexamples -pipython --exclude="examples/newparallel/"