[Python-modules-commits] [mutagen] 05/08: 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 1218ea4d7ee4d34d4474d177f06822caeaa2d54f
Merge: 7f563eb 615d40f
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Mon Aug 29 01:03:49 2016 +0200

    merge patched into master

 NEWS                                |  9 +++++++++
 PKG-INFO                            |  2 +-
 debian/.git-dpm                     |  6 +++---
 debian/patches/use-rtd-package      |  2 +-
 debian/patches/use-system-inventory |  2 +-
 mutagen/__init__.py                 |  2 +-
 mutagen/id3/__init__.py             | 11 ++++++++++-
 mutagen/id3/_specs.py               |  6 +++---
 tests/test__id3frames.py            | 20 ++++++++++++++++++++
 9 files changed, 49 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index e829d0b,0000000..d626d45
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
- 62899a25be792d92564cc1d6f989ff648fc0a6ec
- 62899a25be792d92564cc1d6f989ff648fc0a6ec
- 7023b1b670d3efec46ff34058d13e04bd7e511bb
++615d40fb19aae3aa90918cd912d8465a90dd6798
++615d40fb19aae3aa90918cd912d8465a90dd6798
++d905cbef7fd30162f83506cdd3dfe5177b4df9f1
 +d905cbef7fd30162f83506cdd3dfe5177b4df9f1
 +mutagen_1.34.1.orig.tar.gz
 +22f8b7e6ba669411c362e2c82105d8d76fdbfbdb
 +872058
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-rtd-package
index 592ddda,0000000..afc9b99
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,33 @@@
- From f0547cae9be5480a6fcb67b7c1555a9d9830db06 Mon Sep 17 00:00:00 2001
++From 343d73375a90da24559821d9790dbb45f810db11 Mon Sep 17 00:00:00 2001
 +From: Tristan Seligmann <mithrandi at debian.org>
 +Date: Thu, 8 Oct 2015 09:57:12 -0700
 +Subject: Use the Debian package of the sphinx-rtd theme
 +
 +Forwarded: no
 +Last-Update: 2014-12-08
 +Patch-Name: use-rtd-package
 +---
 + docs/conf.py | 3 +++
 + 1 file changed, 3 insertions(+)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index f2fc667..ae92bd7 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -2,6 +2,7 @@
 + 
 + import os
 + import sys
 ++import sphinx_rtd_theme
 + 
 + dir_ = os.path.dirname(os.path.realpath(__file__))
 + sys.path.insert(0, dir_)
 +@@ -31,6 +32,8 @@ exclude_patterns = ['_build']
 + bug_url_template = "https://github.com/quodlibet/mutagen/issues/%s"
 + pr_url_template = "https://github.com/quodlibet/mutagen/pull/%s"
 + bbpr_url_template = "https://bitbucket.org/lazka/mutagen/pull-requests/%s"
 ++html_theme = "sphinx_rtd_theme"
 ++html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
 + 
 + autodoc_member_order = "bysource"
 + default_role = "obj"
diff --cc debian/patches/use-system-inventory
index 6a98269,0000000..707bc80
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,26 -1,0 +1,26 @@@
- From 62899a25be792d92564cc1d6f989ff648fc0a6ec Mon Sep 17 00:00:00 2001
++From 615d40fb19aae3aa90918cd912d8465a90dd6798 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 ae92bd7..2628327 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -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', '/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