[Python-modules-commits] r33955 - in packages/scipy/trunk/debian (6 files)

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

    Date: Sunday, August 23, 2015 @ 17:50:22
  Author: jcjaskula-guest
Revision: 33955

Using the packaged objects.inv (from python-doc and python-numpy-doc)

Modified:
  packages/scipy/trunk/debian/control
  packages/scipy/trunk/debian/patches/use_local_objects.inv.patch
  packages/scipy/trunk/debian/rules
Deleted:
  packages/scipy/trunk/debian/numpy_objects.inv
  packages/scipy/trunk/debian/python_dev_objects.inv
  packages/scipy/trunk/debian/source/include-binaries

Modified: packages/scipy/trunk/debian/control
===================================================================
--- packages/scipy/trunk/debian/control	2015-08-23 04:15:11 UTC (rev 33954)
+++ packages/scipy/trunk/debian/control	2015-08-23 17:50:22 UTC (rev 33955)
@@ -31,6 +31,8 @@
                      python-docutils,
                      python-matplotlib,
 		     python-numpydoc,
+		     python-doc,
+		     python-numpy-doc,
                      python-sphinx,
                      texlive-latex-base,
                      texlive-latex-extra

Deleted: packages/scipy/trunk/debian/numpy_objects.inv
===================================================================
(Binary files differ)

Modified: packages/scipy/trunk/debian/patches/use_local_objects.inv.patch
===================================================================
--- packages/scipy/trunk/debian/patches/use_local_objects.inv.patch	2015-08-23 04:15:11 UTC (rev 33954)
+++ packages/scipy/trunk/debian/patches/use_local_objects.inv.patch	2015-08-23 17:50:22 UTC (rev 33955)
@@ -1,5 +1,6 @@
-Description: Use a local copy of object.inv from doc.python.org and scipy.org, instead of downloading them each time from the internet
-Last-Update: 2015-08-19
+Description: Use a local copy of object.inv from doc.python.org and scipy.org, instead of downloading them each time from the internet.
+Caveat: We use the objects.inv of the stable version, not the development version
+Last-Update: 2015-08-23
 
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
@@ -9,8 +10,8 @@
  intersphinx_mapping = {
 -        'http://docs.python.org/dev': None,
 -        'http://docs.scipy.org/doc/numpy': None,
-+        'http://docs.python.org/dev': '../../debian/python_dev_objects.inv',
-+        'http://docs.scipy.org/doc/numpy': '../../debian/numpy_objects.inv',
++        'http://docs.python.org/dev': '/usr/share/doc/python-doc/html/objects.inv',
++        'http://docs.scipy.org/doc/numpy': '/usr/share/doc/python-numpy-doc/html/objects.inv',
  }
  
  

Deleted: packages/scipy/trunk/debian/python_dev_objects.inv
===================================================================
(Binary files differ)

Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules	2015-08-23 04:15:11 UTC (rev 33954)
+++ packages/scipy/trunk/debian/rules	2015-08-23 17:50:22 UTC (rev 33955)
@@ -121,10 +121,6 @@
 #	dh_installdocs -i
 #	dh_sphinxdoc -i
 
-update_intersphinx_mapping:
-	wget http://docs.python.org/dev/objects.inv -O debian/python_dev_objects.inv
-	wget http://docs.scipy.org/doc/numpy/objects.inv -O debian/numpy_objects.inv
-
 get-orig-source:
 	-uscan --force-download --download-version $(UVER) --rename
 

Deleted: packages/scipy/trunk/debian/source/include-binaries
===================================================================
--- packages/scipy/trunk/debian/source/include-binaries	2015-08-23 04:15:11 UTC (rev 33954)
+++ packages/scipy/trunk/debian/source/include-binaries	2015-08-23 17:50:22 UTC (rev 33955)
@@ -1,2 +0,0 @@
-debian/numpy_objects.inv
-debian/python_dev_objects.inv