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

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

    Date: Tuesday, November 22, 2011 @ 22:43:14
  Author: jtaylor-guest
Revision: 19421

use dh_sphinxdoc

bump sphinx dependency to >= 1.0.7+dfsg-1~, replace libjs-jquery
dependency with ${sphinxdoc:Depends} and drop ipython-doc.links

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/control
  packages/ipython/trunk/debian/rules
Deleted:
  packages/ipython/trunk/debian/ipython-doc.links

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2011-11-22 21:05:41 UTC (rev 19420)
+++ packages/ipython/trunk/debian/changelog	2011-11-22 22:43:14 UTC (rev 19421)
@@ -3,8 +3,11 @@
   * add patch fix-version-checks-for-pyzmq-2.1.10.patch
   * fix debianize-error-messages.patch to reraise unknown exceptions
   * suggest python-zmq for ipython package
+  * use dh_sphinxdoc
+    - bump sphinx dependency to >= 1.0.7+dfsg-1~, replace libjs-jquery
+      dependency with ${sphinxdoc:Depends} and drop ipython-doc.links
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 22 Nov 2011 20:43:28 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 22 Nov 2011 22:47:53 +0100
 
 ipython (0.11-1) experimental; urgency=low
 

Modified: packages/ipython/trunk/debian/control
===================================================================
--- packages/ipython/trunk/debian/control	2011-11-22 21:05:41 UTC (rev 19420)
+++ packages/ipython/trunk/debian/control	2011-11-22 22:43:14 UTC (rev 19421)
@@ -18,7 +18,7 @@
                      python-pyparsing,
                      python-qt4,
                      python-simplegeneric,
-                     python-sphinx,
+                     python-sphinx (>= 1.0.7+dfsg-1~),
                      python-wxgtk2.8,
                      python-zmq (>= 2.1.4),
                      xauth,
@@ -103,7 +103,7 @@
 Package: ipython-doc
 Section: doc
 Architecture: all
-Depends: libjs-jquery, ${misc:Depends}
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
 Description: enhanced interactive Python shell
  IPython can be used as a replacement for the standard Python shell,
  or it can be used as a complete working environment for scientific

Deleted: packages/ipython/trunk/debian/ipython-doc.links
===================================================================
--- packages/ipython/trunk/debian/ipython-doc.links	2011-11-22 21:05:41 UTC (rev 19420)
+++ packages/ipython/trunk/debian/ipython-doc.links	2011-11-22 22:43:14 UTC (rev 19421)
@@ -1 +0,0 @@
-/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-22 21:05:41 UTC (rev 19420)
+++ packages/ipython/trunk/debian/rules	2011-11-22 22:43:14 UTC (rev 19421)
@@ -7,7 +7,7 @@
 	dh_compress -Xhtml/
 
 %:
-	dh $@ --with python2
+	dh $@ --with python2,sphinxdoc
 
 override_dh_auto_clean:
 	rm -f test_hist.sqlite
@@ -84,3 +84,8 @@
 override_dh_installexamples:
 	dh_installexamples -pipython --exclude="examples/newparallel/"
 	dh_installexamples -pipython-parallel
+
+override_dh_sphinxdoc:
+ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
+	dh_sphinxdoc
+endif