[Python-modules-commits] r19145 - in packages/migrate/trunk/debian (5 files)

[jandd at users.alioth.debian.org]

    Date: Tuesday, November 1, 2011 @ 23:00:39
  Author: jandd
Revision: 19145

  - bump python-sphinx build dependency to >= 1.0.7+dfsg~ (for
    dh_sphinxdoc)
* add debian/patches/use-local-intersphinx.patch and
  debian/patches/series to avoid fetching objects.inv from the web

Added:
  packages/migrate/trunk/debian/patches/use-local-intersphinx.patch
Modified:
  packages/migrate/trunk/debian/changelog
  packages/migrate/trunk/debian/control
  packages/migrate/trunk/debian/patches/series
  packages/migrate/trunk/debian/rules

Modified: packages/migrate/trunk/debian/changelog
===================================================================
--- packages/migrate/trunk/debian/changelog	2011-11-01 22:36:28 UTC (rev 19144)
+++ packages/migrate/trunk/debian/changelog	2011-11-01 23:00:39 UTC (rev 19145)
@@ -4,7 +4,8 @@
   * debian/control:
     - add python-sphinxcontrib.issuetracker to Build-Depends-Indep
     - drop X-Python-Version
-    - bump python-sphinx build dependency to >= 1.0.7~ (for dh_sphinxdoc)
+    - bump python-sphinx build dependency to >= 1.0.7+dfsg~ (for
+      dh_sphinxdoc)
     - bump python-sqlalchemy dependency to >= 0.6 (upstream support for
       older version has been dropped)
     - add libjs-sphinxdoc and ${sphinxdoc:Depends} to Depends
@@ -14,6 +15,8 @@
     - remove treatment for manage.py_tmpl (removed from upstream release)
     - use dh_sphinxdoc
     - remove manual sphinx doc installation
+  * add debian/patches/use-local-intersphinx.patch and
+    debian/patches/series to avoid fetching objects.inv from the web
 
  -- Jan Dittberner <jandd at debian.org>  Tue, 01 Nov 2011 22:45:22 +0100
 

Modified: packages/migrate/trunk/debian/control
===================================================================
--- packages/migrate/trunk/debian/control	2011-11-01 22:36:28 UTC (rev 19144)
+++ packages/migrate/trunk/debian/control	2011-11-01 23:00:39 UTC (rev 19145)
@@ -5,8 +5,9 @@
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~)
 Build-Depends-Indep: python (>= 2.6.5~), python-setuptools (>= 0.6b3),
- python-sphinx (>= 1.0.7~), python-sqlalchemy (>= 0.6), python-decorator,
- python-tempita (>= 0.4), python-sphinxcontrib.issuetracker
+ python-sphinx (>= 1.0.7+dfsg~), python-sqlalchemy (>= 0.6),
+ python-decorator, python-tempita (>= 0.4),
+ python-sphinxcontrib.issuetracker
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/sqlalchemy-migrate/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/migrate/trunk

Modified: packages/migrate/trunk/debian/patches/series
===================================================================
--- packages/migrate/trunk/debian/patches/series	2011-11-01 22:36:28 UTC (rev 19144)
+++ packages/migrate/trunk/debian/patches/series	2011-11-01 23:00:39 UTC (rev 19145)
@@ -1 +1,2 @@
+use-local-intersphinx.patch
 keep_empty_modules.patch

Added: packages/migrate/trunk/debian/patches/use-local-intersphinx.patch
===================================================================
--- packages/migrate/trunk/debian/patches/use-local-intersphinx.patch	                        (rev 0)
+++ packages/migrate/trunk/debian/patches/use-local-intersphinx.patch	2011-11-01 23:00:39 UTC (rev 19145)
@@ -0,0 +1,14 @@
+Subject: use local objects.inv for intersphinx configuration
+Author: Jan Dittberner <jandd at debian.org>
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -32,8 +32,7 @@
+ 
+ # link to sqlalchemy docs
+ intersphinx_mapping = {
+-    'sqlalchemy': ('http://www.sqlalchemy.org/docs/', None),
+-    'python': ('http://docs.python.org/2.7', None)}
++    'sqlalchemy': ('http://www.sqlalchemy.org/docs/', '/usr/share/doc/python-sphinx/html/objects.inv')}
+ 
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['_templates']

Modified: packages/migrate/trunk/debian/rules
===================================================================
--- packages/migrate/trunk/debian/rules	2011-11-01 22:36:28 UTC (rev 19144)
+++ packages/migrate/trunk/debian/rules	2011-11-01 23:00:39 UTC (rev 19145)
@@ -18,8 +18,6 @@
 
 override_dh_auto_install:
 	# install documentation
-	#cp -R $(DOCS) docs/conf.py \
-	#  debian/python-migrate/usr/share/doc/python-migrate/
 	PYTHONPATH=$(CURDIR) sphinx-build -b html -a -E -N \
 	  docs/ \
 	  debian/python-migrate/usr/share/doc/python-migrate/html/