[Python-modules-commits] [mutagen] 08/11: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository mutagen.

commit 5deb95fa84fefa2957387a4097f6e922cf5869dd
Merge: 31ff46a 9ce7c75
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Jul 16 18:13:59 2016 +0200

    merge patched into master

 debian/.git-dpm                     |  4 ++--
 debian/patches/use-system-inventory | 31 ++++++++++++++-----------------
 docs/conf.py                        | 11 ++++++++---
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --cc debian/.git-dpm
index ec1e461,0000000..7913b16
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 5c3fc0e31274f2a0d9dffea323d6cd8f0a05ca21
- 5c3fc0e31274f2a0d9dffea323d6cd8f0a05ca21
++9ce7c75d542f0b5373f67a65f1e44e5c65a6d07c
++9ce7c75d542f0b5373f67a65f1e44e5c65a6d07c
 +ffdba0c7efe4bedb0f42e4c7ab3e159d20330384
 +ffdba0c7efe4bedb0f42e4c7ab3e159d20330384
 +mutagen_1.33.2.orig.tar.gz
 +e4379cb2c4e663e055d45e66ab582fe90ec0ac75
 +863803
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-system-inventory
index 35ca686,0000000..3ef79a0
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,29 -1,0 +1,26 @@@
- From 5c3fc0e31274f2a0d9dffea323d6cd8f0a05ca21 Mon Sep 17 00:00:00 2001
++From 9ce7c75d542f0b5373f67a65f1e44e5c65a6d07c Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at debian.org>
 +Date: Thu, 8 Oct 2015 09:57:13 -0700
 +Subject: Use the system copy of the Python documentation inventory
 +
 +Forwarded: no
 +Patch-Name: use-system-inventory
 +---
-  docs/conf.py | 7 +------
-  1 file changed, 1 insertion(+), 6 deletions(-)
++ docs/conf.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index ae92bd7..a9504c1 100644
++index ae92bd7..2628327 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
- @@ -11,12 +11,7 @@ import mutagen
-  
-  needs_sphinx = "1.3"
-  
- -extensions = [
- -    'sphinx.ext.autodoc',
- -    'sphinx.ext.napoleon',
- -    'sphinx.ext.intersphinx',
- -    'ext',
- -]
- +extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext']
++@@ -18,8 +18,8 @@ extensions = [
++     'ext',
++ ]
 + intersphinx_mapping = {
-      'python': ('https://docs.python.org/2.7', None),
-      'python3': ('https://docs.python.org/3.5', None),
++-    'python': ('https://docs.python.org/2.7', None),
++-    'python3': ('https://docs.python.org/3.5', None),
+++    'python': ('https://docs.python.org/2.7', '/usr/share/doc/python2.7/html/objects.inv'),
+++    'python3': ('https://docs.python.org/3.5', '/usr/share/doc/python3.5/html/objects.inv'),
++ }
++ source_suffix = '.rst'
++ master_doc = 'index'

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