[Python-modules-commits] [django-classy-tags] 10/12: merge patched into master

[Michael Fladischer]

This is an automated email from the git hooks/post-receive script.

fladi pushed a commit to branch master
in repository django-classy-tags.

commit 2df780f6e978aacb290d239510441a0700cadd18
Merge: fbb547b a50548d
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Sep 1 09:32:02 2016 +0200

    merge patched into master

 debian/.git-dpm                  | 6 +++---
 debian/patches/intersphinx.patch | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 30fdab8,0000000..3df112f
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
- e7a229d896f1bb82be901b66dce14a73c74dbc30
- e7a229d896f1bb82be901b66dce14a73c74dbc30
- 000ea39c348370b7fb7183eb700772a54c16006e
++a50548de4e8b8b0ee93c57797e63a2e1fb2c780a
++a50548de4e8b8b0ee93c57797e63a2e1fb2c780a
++4e143fcc86e2f540b2075a0e342324740a6d82e4
 +4e143fcc86e2f540b2075a0e342324740a6d82e4
 +django-classy-tags_0.8.0.orig.tar.gz
 +20d5fdf63f92ce2058fbd316d187928755293a4b
 +36591
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index f8b5f18,0000000..6565908
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,29 -1,0 +1,29 @@@
- From e7a229d896f1bb82be901b66dce14a73c74dbc30 Mon Sep 17 00:00:00 2001
++From a50548de4e8b8b0ee93c57797e63a2e1fb2c780a Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:50:54 -0700
 +Subject: Disable objects.inv download for sphinx.
 +
 + The python-django-doc package does not ship a objects.inv file by now, so there
 + is no sense in keeping intersphinx enabled. Once it is shipped, the patch
 + should switch to using the locally available Django objects.inv.
 +Last-Update: 2014-04-25
 +Forwarded: not-needed
 +
 +Patch-Name: intersphinx.patch
 +---
 + docs/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 37fcd78..4f5454b 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -24,7 +24,7 @@ import sys, os
 + # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
 + extensions = ["sphinx.ext.intersphinx"]
 + 
 +-intersphinx_mapping = {'django': ('http://readthedocs.org/projects/eric/django/docs/', None)}
 ++#intersphinx_mapping = {'django': ('http://readthedocs.org/projects/eric/django/docs/', None)}
 + 
 + # 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-classy-tags.git