[Python-modules-commits] [django-reversion] 04/07: 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-reversion.

commit 6f970aa36c96852bed4de3999dc194c92813256d
Merge: 69099b4 6a817d6
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Fri Dec 4 17:07:18 2015 +0100

    merge patched into master

 .travis.yml                                        |  31 +-
 CHANGELOG.rst => CHANGELOG.md                      | 179 +++++++----
 MANIFEST.in                                        |   4 +-
 README.rst                                         |   8 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/intersphinx.patch                   |   4 +-
 docs/admin.rst                                     |  12 +-
 docs/api.rst                                       |  94 +++---
 docs/conf.py                                       |   4 +-
 docs/diffs.rst                                     |   8 +-
 docs/django-versions.rst                           |   2 +-
 docs/how-it-works.rst                              |   8 +-
 docs/index.rst                                     |   8 +-
 docs/signals.rst                                   |   9 +-
 setup.py                                           |   4 +-
 src/reversion/__init__.py                          |  43 +--
 src/reversion/admin.py                             |  16 +-
 src/reversion/errors.py                            |  13 +
 src/reversion/locale/de/LC_MESSAGES/django.mo      | Bin 2534 -> 2599 bytes
 src/reversion/locale/de/LC_MESSAGES/django.po      |   4 +
 src/reversion/locale/es_AR/LC_MESSAGES/django.mo   | Bin 0 -> 2507 bytes
 src/reversion/locale/es_AR/LC_MESSAGES/django.po   | 134 ++++++++
 .../management/commands/createinitialrevisions.py  |  12 +-
 src/reversion/models.py                            |  13 +-
 src/reversion/revisions.py                         |  46 ++-
 src/reversion/signals.py                           |   6 +
 src/reversion/version.py                           |   1 -
 src/tests/test_reversion/admin.py                  |   8 +-
 src/tests/test_reversion/tests.py                  | 354 +++++++++++----------
 29 files changed, 630 insertions(+), 401 deletions(-)

diff --cc debian/.git-dpm
index 22f4257,0000000..197595c
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
- 034ceedf114f24119851e8a1761fc8b3a3d8bc0b
- 034ceedf114f24119851e8a1761fc8b3a3d8bc0b
- f7ee3fbf38969af205901131b17af9401fa8257a
++6a817d6acfe388dd943392634b3ac40f57867c0b
++6a817d6acfe388dd943392634b3ac40f57867c0b
++eff368a2f2f7ea64de7a9a772c7645afc7240b70
 +eff368a2f2f7ea64de7a9a772c7645afc7240b70
 +django-reversion_1.10.0.orig.tar.gz
 +c87035f6ec9d82926b8cb4320a9012a372e30767
 +70829
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/intersphinx.patch
index 4bd3226,0000000..c928314
mode 100644,000000..100644
--- a/debian/patches/intersphinx.patch
+++ b/debian/patches/intersphinx.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 034ceedf114f24119851e8a1761fc8b3a3d8bc0b Mon Sep 17 00:00:00 2001
++From 6a817d6acfe388dd943392634b3ac40f57867c0b Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 08:56:37 -0700
 +Subject: use local objects.inv where possible
 +
 + Upstream uses intersphinx mappings that fetch the objects.inv for Python, HTTP
 + from a remote host. Using the local objects.inv from Python enables the package
 + to build without network connection.
 +Forwarded: not-needed
 +Last-Update: 2015-05-19
 +
 +Patch-Name: intersphinx.patch
 +---
 + docs/conf.py | 13 ++++++++++++-
 + 1 file changed, 12 insertions(+), 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 03c7ac0..604425c 100644
++index 45d3047..6615316 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -244,4 +244,15 @@ texinfo_documents = [
 + 
 + 
 + # Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {'http://docs.python.org/': 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'))
 ++

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