[Python-modules-commits] [django-tables] 01/01: Convert from git-dpm to patches unapplied format

Brian May bam at moszumanska.debian.org
Sun Jun 25 08:20:05 UTC 2017


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 d0e1215c24f1ed00993122e530f16d6d46916cde
Author: Brian May <bam at moszumanska.debian.org>
Date:   Sun Jun 25 08:15:12 2017 +0000

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm               | 11 -----------
 debian/gbp.conf               |  2 ++
 docs/conf.py                  |  6 +++---
 docs/pages/generic-mixins.rst |  2 ++
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 3c0e5fb..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-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 --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..3879982
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/master
diff --git a/docs/conf.py b/docs/conf.py
index ea3533f..42836f5 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]
 
 
@@ -28,8 +28,8 @@ extensions = [
 ]
 
 intersphinx_mapping = {
-    'python': ('/usr/share/doc/python2.7-doc/html', None),
-    'django': ('/usr/share/doc/python-django-doc/html', None),
+    'python': ('http://docs.python.org/dev/', None),
+    'django': ('http://docs.djangoproject.com/en/dev/', 'http://docs.djangoproject.com/en/dev/_objects/'),
 }
 
 
diff --git a/docs/pages/generic-mixins.rst b/docs/pages/generic-mixins.rst
index 62ad155..b127054 100644
--- a/docs/pages/generic-mixins.rst
+++ b/docs/pages/generic-mixins.rst
@@ -13,6 +13,8 @@ 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

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



More information about the Python-modules-commits mailing list