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

[morph at users.alioth.debian.org]

    Date: Sunday, April 8, 2012 @ 14:51:54
  Author: morph
Revision: 21106

* debian/{control, rules}
  - use dh_sphinxdoc

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

Modified: packages/matplotlib/trunk/debian/changelog
===================================================================
--- packages/matplotlib/trunk/debian/changelog	2012-04-08 14:47:55 UTC (rev 21105)
+++ packages/matplotlib/trunk/debian/changelog	2012-04-08 14:51:54 UTC (rev 21106)
@@ -3,8 +3,10 @@
   * debian/patches/60_new_syntax_to_load_searchindex.patch
     - use new Sphinx syntax to load searchindex.js so dh_sphinxdoc is able to
       recognize search.html as a valid Sphinx search page
+  * debian/{control, rules}
+    - use dh_sphinxdoc
 
- -- Sandro Tosi <morph at debian.org>  Sun, 08 Apr 2012 16:46:05 +0200
+ -- Sandro Tosi <morph at debian.org>  Sun, 08 Apr 2012 16:50:32 +0200
 
 matplotlib (1.1.1~rc1-1) unstable; urgency=low
 

Modified: packages/matplotlib/trunk/debian/control
===================================================================
--- packages/matplotlib/trunk/debian/control	2012-04-08 14:47:55 UTC (rev 21105)
+++ packages/matplotlib/trunk/debian/control	2012-04-08 14:51:54 UTC (rev 21106)
@@ -24,7 +24,7 @@
                python-qt4,
                python-qt4-dev,
                python-setuptools,
-               python-sphinx (>= 0.5.1),
+               python-sphinx (>= 1.0.7+dfsg),
                python-support (>= 1.0.0),
                python-tk (>= 2.5.2-1.1),
                python-traits (>= 2.0),

Modified: packages/matplotlib/trunk/debian/rules
===================================================================
--- packages/matplotlib/trunk/debian/rules	2012-04-08 14:47:55 UTC (rev 21105)
+++ packages/matplotlib/trunk/debian/rules	2012-04-08 14:51:54 UTC (rev 21106)
@@ -134,9 +134,8 @@
 	find $(CURDIR)/debian/$(pd)/ -type f -name '*.pyc' | xargs rm -f
 	dh_installexamples -p$(pd) -i examples/*
 	dh_compress -i -Xexamples -Xexamples/data -Xpdf -X.js -Xobjects.inv
-	ln -sf /usr/share/javascript/jquery/jquery.js \
-		$(CURDIR)/debian/$(pd)/usr/share/doc/python-matplotlib-doc/html/_static/jquery.js
 	dh_link -i
+	dh_sphinxdoc
 	dh_lintian -i
 	dh_fixperms -i
 	dh_installdeb -i