[Python-modules-commits] [django-polymorphic] 01/06: 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 django-polymorphic.

commit 7bdcd12575c689c7857a9af5c027022f5ba82541
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Aug 8 10:47:20 2017 +0200

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

diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index 8c7c86a..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-cb5b5d9c82f7e6c4e61b2bb6a4fb1935fd2ed5de
-cb5b5d9c82f7e6c4e61b2bb6a4fb1935fd2ed5de
-5147ba19ea8c5b059f92669ca749e47f5c491dc5
-5147ba19ea8c5b059f92669ca749e47f5c491dc5
-django-polymorphic_1.2.orig.tar.gz
-a6e5768707fbe17e8aa2d909becbc37353b7d049
-97153
-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 abae0fb..5221d1b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -257,22 +257,11 @@ texinfo_documents = [
 #texinfo_show_urls = 'footnote'
 
 
-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(
-        'django',
-        'https://docs.djangoproject.com/en/{v}'.format(
-            v='.'.join(map(str, django.VERSION[:2]))
-        ),
-        '/usr/share/doc/python-django-doc/html/objects.inv'
-    )
-)
+# Example configuration for intersphinx: refer to the Python standard library.
+intersphinx_mapping = {
+    #'http://docs.python.org/': None,
+    'https://docs.djangoproject.com/en/stable': 'https://docs.djangoproject.com/en/stable/_objects',
+}
 
 # autodoc settings
 autodoc_member_order = 'groupwise'

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