[Python-modules-commits] r26566 - in packages/django-auth-ldap/trunk/debian (6 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Tue Nov 26 08:02:44 UTC 2013
Date: Tuesday, November 26, 2013 @ 08:02:43
Author: fladi-guest
Revision: 26566
New upstream release.
Added:
packages/django-auth-ldap/trunk/debian/patches/
packages/django-auth-ldap/trunk/debian/patches/docs-do_not_install_archive.patch
packages/django-auth-ldap/trunk/debian/patches/docs-use_local_intersphinx_mapping.patch
packages/django-auth-ldap/trunk/debian/patches/series
Modified:
packages/django-auth-ldap/trunk/debian/changelog
packages/django-auth-ldap/trunk/debian/control
Modified: packages/django-auth-ldap/trunk/debian/changelog
===================================================================
--- packages/django-auth-ldap/trunk/debian/changelog 2013-11-25 21:53:33 UTC (rev 26565)
+++ packages/django-auth-ldap/trunk/debian/changelog 2013-11-26 08:02:43 UTC (rev 26566)
@@ -1,4 +1,4 @@
-django-auth-ldap (1.1.5-1) unstable; urgency=low
+django-auth-ldap (1.1.7-1) unstable; urgency=low
[ Michael Fladischer ]
* New upstream release (Closes: #678703).
@@ -11,6 +11,12 @@
* Drop unnecessary versioned dependencies in Depends and Build-Depends:
+ python-all
+ python-ldap
+ * Ommit installing archived documentation:
+ + Add patch docs-do_not_install_archive.patch.
+ * Use locally installed objects.inv for intersphinx mapping:
+ + Add patch docs-use_local_intersphinx_mapping.patch.
+ + Add python-doc to Build-Depends.
+ + Add python-django-doc to Build-Depends.
* Format packaging files with wrap-and-sort.
* Change documentation source directory for sphinx.
* Update years in d/copyright.
@@ -21,7 +27,7 @@
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
- -- Michael Fladischer <FladischerMichael at fladi.at> Thu, 24 Jan 2013 15:00:19 +0100
+ -- Michael Fladischer <FladischerMichael at fladi.at> Tue, 26 Nov 2013 08:57:20 +0100
django-auth-ldap (1.0.19-2) unstable; urgency=low
Modified: packages/django-auth-ldap/trunk/debian/control
===================================================================
--- packages/django-auth-ldap/trunk/debian/control 2013-11-25 21:53:33 UTC (rev 26565)
+++ packages/django-auth-ldap/trunk/debian/control 2013-11-26 08:02:43 UTC (rev 26566)
@@ -6,6 +6,8 @@
Build-Depends: debhelper (>= 8.1.0~),
python-all,
python-django (>= 1.3),
+ python-django-doc (>= 1.3),
+ python-doc,
python-ldap,
python-setuptools,
python-sphinx (>= 1.0.7+dfsg)
Added: packages/django-auth-ldap/trunk/debian/patches/docs-do_not_install_archive.patch
===================================================================
--- packages/django-auth-ldap/trunk/debian/patches/docs-do_not_install_archive.patch (rev 0)
+++ packages/django-auth-ldap/trunk/debian/patches/docs-do_not_install_archive.patch 2013-11-26 08:02:43 UTC (rev 26566)
@@ -0,0 +1,19 @@
+Description: Do not include a static copy of "archive"
+ Upstream configured sphinx to do a static copy of the "archive" directory,
+ which is useless in the contet of the Debian package as it only contains
+ outdated versions of the documentation.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2013-11-26
+Forwarded: not-needed
+
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -134,7 +134,7 @@
+ # Add any paths that contain custom static files (such as style sheets) here,
+ # relative to this directory. They are copied after the builtin static files,
+ # so a file named "default.css" will overwrite the builtin "default.css".
+-html_static_path = ['../archive']
++#html_static_path = ['../archive']
+
+ # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
+ # using the given strftime format.
Added: packages/django-auth-ldap/trunk/debian/patches/docs-use_local_intersphinx_mapping.patch
===================================================================
--- packages/django-auth-ldap/trunk/debian/patches/docs-use_local_intersphinx_mapping.patch (rev 0)
+++ packages/django-auth-ldap/trunk/debian/patches/docs-use_local_intersphinx_mapping.patch 2013-11-26 08:02:43 UTC (rev 26566)
@@ -0,0 +1,40 @@
+Description: use local objects.inv where possible
+ Upstream uses intersphinx mappings that fetch the objects.inv for python and
+ python-django by HTTP from a remote host. Using the local objects.inv from
+ python and kombu enables the package to build without network connection.
+Author: Michael Fladischer <FladischerMichael at fladi.at>
+Last-Update: 2013-11-26
+Forwarded: not-needed
+
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -29,12 +29,23 @@
+ 'daldocs',
+ ]
+
+-intersphinx_mapping = {
+- 'python': ('http://docs.python.org/', None),
+- 'django': ('https://docs.djangoproject.com/en/dev/',
+- 'https://docs.djangoproject.com/en/dev/_objects/'),
+- 'pythonldap': ('http://python-ldap.org/doc/html/', None),
+-}
++def check_object_path(key, url, path):
++ if os.path.isfile(path):
++ return {key: (url, path)}
++ return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++ 'http://docs.python.org/',
++ '/usr/share/doc/python'
++ + '.'.join([str(x) for x in sys.version_info[0:2]])
++ + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('django',
++ 'https://docs.djangoproject.com/en/dev/',
++ '/usr/share/doc/python-django-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('pythonldap',
++ 'http://python-ldap.org/doc/html/',
++ ''))
+
+ # Add any paths that contain templates here, relative to this directory.
+ templates_path = ['../_templates']
Added: packages/django-auth-ldap/trunk/debian/patches/series
===================================================================
--- packages/django-auth-ldap/trunk/debian/patches/series (rev 0)
+++ packages/django-auth-ldap/trunk/debian/patches/series 2013-11-26 08:02:43 UTC (rev 26566)
@@ -0,0 +1,2 @@
+docs-do_not_install_archive.patch
+docs-use_local_intersphinx_mapping.patch
More information about the Python-modules-commits
mailing list