[Python-modules-commits] [django-classy-tags] 04/06: 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 162bda1da26231fa58003df5cf0f54b23bbb5008
Merge: 4ecbe5f 4886b09
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Mar 2 18:26:54 2016 +0100

    merge patched into master

 classytags/__init__.py           |  2 +-
 classytags/tests.py              | 81 +++++++++++++++++++++++++++++++++++-----
 classytags/utils.py              | 21 +++++++++--
 debian/.git-dpm                  |  6 +--
 debian/patches/intersphinx.patch |  2 +-
 docs/changes.rst                 |  7 ++++
 6 files changed, 101 insertions(+), 18 deletions(-)

diff --cc debian/.git-dpm
index 3136c32,0000000..a869867
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
- ffe9f417414e95095444f3061ac51caf19fd6df7
- ffe9f417414e95095444f3061ac51caf19fd6df7
- f29f75bfba4f22635a67acbea2e5ebe669c26e19
++4886b09c8243f745ba9768f7993ee9b7880eb096
++4886b09c8243f745ba9768f7993ee9b7880eb096
++e48f21fa6306e61da1654f9e2d6914fc11146bc5
 +e48f21fa6306e61da1654f9e2d6914fc11146bc5
 +django-classy-tags_0.7.2.orig.tar.gz
 +49483edbc12b76d34d7f8fd922743e4df245a949
 +36154
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 6636c27,0000000..6c4d127
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,29 -1,0 +1,29 @@@
- From ffe9f417414e95095444f3061ac51caf19fd6df7 Mon Sep 17 00:00:00 2001
++From 4886b09c8243f745ba9768f7993ee9b7880eb096 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