[Python-modules-commits] [mutagen] 05/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 8b23ad769d8dc1c596a7ea1566eea735b40dc72c
Merge: c7f93d0 5c3fc0e
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Jul 16 17:43:23 2016 +0200

    merge patched into master

 NEWS                                |  6 ++++++
 PKG-INFO                            |  2 +-
 debian/.git-dpm                     |  6 +++---
 debian/patches/use-rtd-package      |  2 +-
 debian/patches/use-system-inventory |  2 +-
 mutagen/__init__.py                 |  2 +-
 mutagen/_util.py                    |  5 ++---
 mutagen/apev2.py                    |  6 ++++--
 tests/test___init__.py              |  3 +--
 tests/test__util.py                 | 34 ++++++++++++++++++++++++----------
 10 files changed, 44 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 0eca211,0000000..ec1e461
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
- b0ed8c9c3c4d55c24bd1bac05573e6f1a86adc24
- b0ed8c9c3c4d55c24bd1bac05573e6f1a86adc24
- d919475ac2eaf43d3246aeccffef00bae4e5ab63
++5c3fc0e31274f2a0d9dffea323d6cd8f0a05ca21
++5c3fc0e31274f2a0d9dffea323d6cd8f0a05ca21
++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-rtd-package
index 425160c,0000000..5a61c07
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,33 @@@
- From b6402458646897cdf93092bd816de93d11f265c5 Mon Sep 17 00:00:00 2001
++From 32711a6077c931818c95190faa16aefc9c28b963 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 d1e3edf,0000000..35ca686
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,29 -1,0 +1,29 @@@
- From b0ed8c9c3c4d55c24bd1bac05573e6f1a86adc24 Mon Sep 17 00:00:00 2001
++From 5c3fc0e31274f2a0d9dffea323d6cd8f0a05ca21 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(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index ae92bd7..a9504c1 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']
 + intersphinx_mapping = {
 +     'python': ('https://docs.python.org/2.7', None),
 +     'python3': ('https://docs.python.org/3.5', None),

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