[Python-modules-commits] [django-auth-ldap] 05/08: merge patched into master
Michael Fladischer
fladi at moszumanska.debian.org
Sat Jan 2 15:45:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository django-auth-ldap.
commit 0bc48c03c519f5f40e52ee1155e7a28c75874c7b
Merge: 2017a02 d3d1f77
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Sat Jan 2 16:05:20 2016 +0100
merge patched into master
CHANGES | 6 +++++
PKG-INFO | 27 +++++++++-------------
README | 25 ++++++++------------
debian/.git-dpm | 6 ++---
debian/patches/docs-do_not_install_archive.patch | 4 ++--
.../docs-use_local_intersphinx_mapping.patch | 4 ++--
django_auth_ldap.egg-info/PKG-INFO | 27 +++++++++-------------
django_auth_ldap/__init__.py | 2 +-
django_auth_ldap/models.py | 3 ++-
django_auth_ldap/tests.py | 8 ++++++-
docs/source/conf.py | 2 +-
docs/source/index.rst | 14 ++++-------
docs/source/multiconfig.rst | 2 +-
docs/source/reference.rst | 6 +++++
docs/source/users.rst | 5 ++++
setup.py | 12 +++++++---
test/settings.py | 2 ++
tox.ini | 18 +++++++++++----
18 files changed, 97 insertions(+), 76 deletions(-)
diff --cc debian/.git-dpm
index ef93e73,0000000..4f44d1c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- bbbf535a9335be5b4dc8c0f62f2bf3d9d26c2c69
- bbbf535a9335be5b4dc8c0f62f2bf3d9d26c2c69
- 86d47d41b76508349b4a21850ce72e22d1862a69
++d3d1f77e11f242b01378f6b04967593e6cba1e5c
++d3d1f77e11f242b01378f6b04967593e6cba1e5c
++534a9e62260d353455ce5051cccd39d293ffc277
+534a9e62260d353455ce5051cccd39d293ffc277
+django-auth-ldap_1.2.7+dfsg.orig.tar.gz
+6a8e13472ccac13bcd62daaa8c16a7281da83dc2
+100858
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/docs-do_not_install_archive.patch
index a780785,0000000..2e17374
mode 100644,000000..100644
--- a/debian/patches/docs-do_not_install_archive.patch
+++ b/debian/patches/docs-do_not_install_archive.patch
@@@ -1,29 -1,0 +1,29 @@@
- From cef80580c0a2a6a4959deb7acba8d6fbe042e6a0 Mon Sep 17 00:00:00 2001
++From ca257dbfa64d9da50ff64d81853a9b27e11f9f02 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:49:53 -0700
+Subject: 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.
+Last-Update: 2013-11-26
+Forwarded: not-needed
+
+Patch-Name: docs-do_not_install_archive.patch
+---
+ docs/source/conf.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index edb38cf..3251530 100644
++index c0ddf1c..6faad9b 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -134,7 +134,7 @@ html_theme_options = {
+ # 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.
diff --cc debian/patches/docs-use_local_intersphinx_mapping.patch
index dc2e6ab,0000000..6a2ea6a
mode 100644,000000..100644
--- a/debian/patches/docs-use_local_intersphinx_mapping.patch
+++ b/debian/patches/docs-use_local_intersphinx_mapping.patch
@@@ -1,50 -1,0 +1,50 @@@
- From bbbf535a9335be5b4dc8c0f62f2bf3d9d26c2c69 Mon Sep 17 00:00:00 2001
++From d3d1f77e11f242b01378f6b04967593e6cba1e5c Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 08:49:54 -0700
+Subject: 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.
+Last-Update: 2013-11-26
+Forwarded: not-needed
+
+Patch-Name: docs-use_local_intersphinx_mapping.patch
+---
+ docs/source/conf.py | 23 +++++++++++++++++------
+ 1 file changed, 17 insertions(+), 6 deletions(-)
+
+diff --git a/docs/source/conf.py b/docs/source/conf.py
- index 3251530..f72b424 100644
++index 6faad9b..ecb34e0 100644
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -29,12 +29,23 @@ extensions = [
+ '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']
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-auth-ldap.git
More information about the Python-modules-commits
mailing list