[Python-modules-commits] [django-classy-tags] 04/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 90fd924919425efdfde937c74e98d17f6aace7b5
Merge: 8c6933d e7a229d
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Thu Sep 1 09:30:04 2016 +0200

    merge patched into master

 .travis.yml                                        |  10 +-
 README.rst                                         |   2 +-
 classytags/__init__.py                             |   2 +-
 classytags/core.py                                 |  29 ++--
 classytags/tests.py                                | 165 ++++++++++++++++-----
 debian/.git-dpm                                    |   6 +-
 .../0002-django-1.10-define_TEMPLATES.patch        |  40 -----
 debian/patches/intersphinx.patch                   |   2 +-
 debian/patches/series                              |   1 -
 docs/changes.rst                                   |   7 +
 docs/installation.rst                              |   5 +-
 runtests.py                                        |   6 +-
 setup.py                                           |   1 -
 13 files changed, 167 insertions(+), 109 deletions(-)

diff --cc debian/.git-dpm
index c7760d4,0000000..55dafeb
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
- 8cfa8e21ecea7c92673c01c1a0a3d995d37a88e3
- 8cfa8e21ecea7c92673c01c1a0a3d995d37a88e3
- e48f21fa6306e61da1654f9e2d6914fc11146bc5
++e7a229d896f1bb82be901b66dce14a73c74dbc30
++e7a229d896f1bb82be901b66dce14a73c74dbc30
++000ea39c348370b7fb7183eb700772a54c16006e
 +000ea39c348370b7fb7183eb700772a54c16006e
 +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 6c4d127,0000000..f8b5f18
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 4886b09c8243f745ba9768f7993ee9b7880eb096 Mon Sep 17 00:00:00 2001
++From e7a229d896f1bb82be901b66dce14a73c74dbc30 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']
diff --cc debian/patches/series
index 5b8cb91,0000000..a695c8d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +intersphinx.patch
- 0002-django-1.10-define_TEMPLATES.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-classy-tags.git