[Python-modules-commits] [mutagen] 09/12: 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 f81fba7c872eb2046238c9b9aac7a661ed487099
Merge: 3679d36 26b59ce
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Tue Aug 8 03:30:20 2017 +0200

    merge patched into master

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

diff --cc debian/.git-dpm
index 2272704,0000000..a3551f2
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
- 8e49a2d571d5138a730a4eab035671d90a139016
- 8e49a2d571d5138a730a4eab035671d90a139016
++26b59ced744c49052c7940437ff6f1f6667ef56f
++26b59ced744c49052c7940437ff6f1f6667ef56f
 +d68e483fbb42ae4ea1cd174e4169629d961cdb68
 +d68e483fbb42ae4ea1cd174e4169629d961cdb68
 +mutagen_1.38.orig.tar.gz
 +bc37d508c5c1513e3118c669da85552478629387
 +913243
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-system-inventory
index 32128ae,0000000..fb869c3
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,26 -1,0 +1,26 @@@
- From 8e49a2d571d5138a730a4eab035671d90a139016 Mon Sep 17 00:00:00 2001
++From 26b59ced744c49052c7940437ff6f1f6667ef56f 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 | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 23d719a..f55835f 100644
++index 23d719a..863a421 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -17,8 +17,8 @@ extensions = [
 +     'sphinx.ext.extlinks',
 + ]
 + 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', '/usr/share/doc/python2.7/html/objects.inv'),
- +    'python3': ('https://docs.python.org/3.5', '/usr/share/doc/python3.5/html/objects.inv'),
+++    'python3': ('https://docs.python.org/3.6', '/usr/share/doc/python3.6/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