[Python-modules-commits] [django-tables] 07/07: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository django-tables.

commit b25925fc40597de88eefb721b0b4e5ffdef1051b
Merge: 970a176 ff621ba
Author: Brian May <bam at debian.org>
Date:   Tue May 3 11:04:05 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-Fix-errors-building-documentation.patch   | 37 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 docs/conf.py                                       |  2 +-
 docs/pages/generic-mixins.rst                      |  2 --
 5 files changed, 41 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index c7338f9,0000000..3c0e5fb
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
- 0260f088cc55b749f8fa9ea87f6fe8720b8e1145
- 0260f088cc55b749f8fa9ea87f6fe8720b8e1145
++ff621baf8fb24b4714ace48c0220b0c33a3bbd52
++ff621baf8fb24b4714ace48c0220b0c33a3bbd52
 +ef66a89cc2badd78e4e67573e6bfc23c221e6095
 +ef66a89cc2badd78e4e67573e6bfc23c221e6095
 +django-tables_1.2.0.orig.tar.gz
 +e66bad8133d4686d905d8919e3caed069b5f4492
 +116722
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fix-errors-building-documentation.patch
index 0000000,0000000..1d7f0f0
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-errors-building-documentation.patch
@@@ -1,0 -1,0 +1,37 @@@
++From ff621baf8fb24b4714ace48c0220b0c33a3bbd52 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Tue, 3 May 2016 11:03:30 +1000
++Subject: Fix errors building documentation
++
++See https://github.com/bradleyayers/django-tables2/issues/324
++---
++ docs/conf.py                  | 2 +-
++ docs/pages/generic-mixins.rst | 2 --
++ 2 files changed, 1 insertion(+), 3 deletions(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index 2082598..ea3533f 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -13,7 +13,7 @@ sys.path.pop(0)
++ 
++ project = 'django-tables2'
++ with open('../django_tables2/__init__.py', 'rb') as f:
++-    release = re.search('__version__ = "(.+?)"', f.read()).group(1)
+++    release = re.search("__version__ = '(.+?)'", f.read()).group(1)
++ version = release.rpartition('.')[0]
++ 
++ 
++diff --git a/docs/pages/generic-mixins.rst b/docs/pages/generic-mixins.rst
++index b127054..62ad155 100644
++--- a/docs/pages/generic-mixins.rst
+++++ b/docs/pages/generic-mixins.rst
++@@ -13,8 +13,6 @@ The following view parameters are supported:
++   options to pass to `.RequestConfig`. Set ``table_pagination=False``
++   to disable pagination.
++ 
++-.. __: https://docs.djangoproject.com/en/stable/topics/class-based-views/
++-
++ For example:
++ 
++ .. sourcecode:: python
diff --cc debian/patches/series
index d891337,0000000..7d70c5c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +local_inventory
++0002-Fix-errors-building-documentation.patch

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