[Python-modules-commits] [django-tables] 04/04: Update patches

[Brian May]

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

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

commit c0a89cdcdda8a4896bb8a4573a1091c2f981f430
Author: Brian May <bam at debian.org>
Date:   Sun Jun 25 18:45:25 2017 +1000

    Update patches
---
 .../0002-Fix-errors-building-documentation.patch   | 37 ----------------------
 debian/patches/local_inventory                     |  7 ++--
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 42 deletions(-)

diff --git a/debian/patches/0002-Fix-errors-building-documentation.patch b/debian/patches/0002-Fix-errors-building-documentation.patch
deleted file mode 100644
index 1d7f0f0..0000000
--- a/debian/patches/0002-Fix-errors-building-documentation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 --git a/debian/patches/local_inventory b/debian/patches/local_inventory
index 2c3596d..141c7e8 100644
--- a/debian/patches/local_inventory
+++ b/debian/patches/local_inventory
@@ -1,4 +1,3 @@
-From 0260f088cc55b749f8fa9ea87f6fe8720b8e1145 Mon Sep 17 00:00:00 2001
 From: Brian May <bam at debian.org>
 Date: Thu, 8 Oct 2015 08:57:46 -0700
 Subject: Use local copies of object.inv for building documentation.
@@ -11,15 +10,15 @@ Patch-Name: local_inventory
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/docs/conf.py b/docs/conf.py
-index 42836f5..2082598 100644
+index 366a97e..150e362 100644
 --- a/docs/conf.py
 +++ b/docs/conf.py
-@@ -28,8 +28,8 @@ extensions = [
+@@ -42,8 +42,8 @@ extensions = [
  ]
  
  intersphinx_mapping = {
 -    'python': ('http://docs.python.org/dev/', None),
--    'django': ('http://docs.djangoproject.com/en/dev/', 'http://docs.djangoproject.com/en/dev/_objects/'),
+-    'django': ('http://docs.djangoproject.com/en/stable/', 'http://docs.djangoproject.com/en/stable/_objects/'),
 +    'python': ('/usr/share/doc/python2.7-doc/html', None),
 +    'django': ('/usr/share/doc/python-django-doc/html', None),
  }
diff --git a/debian/patches/series b/debian/patches/series
index 7d70c5c..d891337 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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