[Python-modules-commits] [python-django-extra-views] 01/02: 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-extra-views.

commit eab1c5dc91b20b75b9ea1e6409a1c515be444682
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Nov 1 17:43:37 2017 +0100

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

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 7f6808f..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-90a87c9d7729a46c65c9bdd33f25c570a54a83c9
-90a87c9d7729a46c65c9bdd33f25c570a54a83c9
-bf9f58450cc0a79d5d76cd24eba7fc6d72815255
-bf9f58450cc0a79d5d76cd24eba7fc6d72815255
-python-django-extra-views_0.9.0.orig.tar.gz
-838d610f7e590c64ae9bce619332e400da97cbc2
-25744
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 4dcf10b..01bf0f0 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -247,20 +247,4 @@ texinfo_documents = [
 
 
 # Example configuration for intersphinx: refer to the Python standard library.
-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/{v}/'.format(
-            v='.'.join(map(str, sys.version_info[:2]))
-        ),
-        '/usr/share/doc/python{v}/html/objects.inv'.format(
-            v='.'.join(map(str, sys.version_info[:2]))
-        )
-    )
-)
+intersphinx_mapping = {'http://docs.python.org/': None}

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