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

[Michael Fladischer]

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

fladi pushed a commit to branch debian/master
in repository python-django-otp.

commit 02c2c4fd72f8562bf53c633b12f23b7503cde6aa
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Nov 1 20:22:30 2017 +0100

    Convert from git-dpm to patches unapplied format
---
 debian/.git-dpm     |  8 --------
 debian/gbp.conf     |  2 ++
 docs/source/conf.py | 30 +++++-------------------------
 3 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 4a9a831..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-79ad3d9a54984fd172f2e1bae8a5b62f0e635338
-79ad3d9a54984fd172f2e1bae8a5b62f0e635338
-3170ba75d6fa22a5f4b03a90e016a93d4e2b61a6
-3170ba75d6fa22a5f4b03a90e016a93d4e2b61a6
-python-django-otp_0.4.0.1.orig.tar.gz
-1864bf71de7224767038bf89c474cab68528a3e1
-40129
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/source/conf.py b/docs/source/conf.py
index ffeeddc..73d0c10 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -60,31 +60,11 @@ django.conf.settings.configure(
 )
 django.setup()
 
-
-django.setup()
-
-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',
-    'https://docs.python.org/{v}/'.format(
-        v='.'.join(map(str, sys.version_info[0:2]))
-    ),
-    '/usr/share/doc/python{v}/html/objects.inv'.format(
-        v='.'.join(map(str, sys.version_info[0:2]))
-    )
-))
-intersphinx_mapping.update(check_object_path(
-    'django',
-    'https://docs.djangoproject.com/en/{v}/'.format(
-        v='.'.join(map(str, django.VERSION[:2]))
-    ),
-    '/usr/share/doc/python-django-doc/html/objects.inv'
-))
+intersphinx_mapping = {
+    'python': ('http://docs.python.org/3/', None),
+    'django': ('https://docs.djangoproject.com/en/1.11/',
+               'https://docs.djangoproject.com/en/1.11/_objects/'),
+}
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']

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