[Python-modules-commits] [mutagen] 07/09: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Wed Aug 3 21:42:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository mutagen.
commit 9e03c78ad822ec6244128783ccc403c59e1354a2
Merge: a3f0bcc 62899a2
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Wed Aug 3 12:14:36 2016 +0200
merge patched into master
NEWS | 20 +
PKG-INFO | 3 +-
debian/.git-dpm | 6 +-
debian/patches/use-rtd-package | 2 +-
debian/patches/use-system-inventory | 2 +-
docs/api/id3.rst | 12 +-
docs/api/id3_frames.rst | 508 ++--------
docs/id3_frames_gen.py | 2 -
docs/index.rst | 4 +-
docs/user/examples/fileobj-iface.py | 2 +
docs/user/id3.rst | 41 +-
mutagen/__init__.py | 2 +-
mutagen/_util.py | 428 ++++++--
mutagen/aac.py | 2 +-
mutagen/easyid3.py | 21 +-
mutagen/flac.py | 2 +-
mutagen/id3/__init__.py | 1133 +--------------------
mutagen/id3/_file.py | 406 ++++++++
mutagen/id3/_frames.py | 548 ++++++----
mutagen/id3/_id3v1.py | 176 ++++
mutagen/id3/_specs.py | 369 +++++--
mutagen/id3/_tags.py | 568 +++++++++++
mutagen/id3/_util.py | 16 +-
mutagen/mp3/__init__.py | 3 +-
mutagen/musepack.py | 2 +-
setup.py | 1 -
tests/__init__.py | 30 +
tests/quality/test_pep8.py | 5 +-
tests/quality/test_pyflakes.py | 3 +-
tests/test___init__.py | 18 +-
tests/test__id3frames.py | 1498 +++++++++++++++++++++++-----
tests/test__id3specs.py | 547 +++++-----
tests/test__id3util.py | 155 +++
tests/test__util.py | 427 +++++---
tests/test_aac.py | 15 +-
tests/test_aiff.py | 22 +-
tests/test_apev2.py | 14 +-
tests/test_asf.py | 25 +-
tests/test_easyid3.py | 24 +-
tests/test_easymp4.py | 17 +-
tests/test_flac.py | 27 +-
tests/test_id3.py | 1877 +++++++++++------------------------
tests/test_m4a.py | 4 +-
tests/test_mp3.py | 31 +-
tests/test_mp4.py | 19 +-
tests/test_musepack.py | 22 +-
tests/test_ogg.py | 32 +-
tests/test_oggflac.py | 20 +-
tests/test_oggopus.py | 15 +-
tests/test_oggspeex.py | 11 +-
tests/test_oggtheora.py | 19 +-
tests/test_oggvorbis.py | 24 +-
tests/test_tools.py | 5 +-
tests/test_tools_mid3iconv.py | 10 +-
tests/test_tools_moggsplit.py | 11 +-
tests/test_trueaudio.py | 10 +-
56 files changed, 5181 insertions(+), 4035 deletions(-)
diff --cc debian/.git-dpm
index a365f24,0000000..b796c42
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
- 9ce7c75d542f0b5373f67a65f1e44e5c65a6d07c
- 9ce7c75d542f0b5373f67a65f1e44e5c65a6d07c
- ffdba0c7efe4bedb0f42e4c7ab3e159d20330384
++62899a25be792d92564cc1d6f989ff648fc0a6ec
++62899a25be792d92564cc1d6f989ff648fc0a6ec
++7023b1b670d3efec46ff34058d13e04bd7e511bb
+7023b1b670d3efec46ff34058d13e04bd7e511bb
+mutagen_1.34.orig.tar.gz
+ce3d707b87f84ad6b6ab51ddcf58ef249ba1d43f
+871691
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-rtd-package
index 5a61c07,0000000..592ddda
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,33 @@@
- From 32711a6077c931818c95190faa16aefc9c28b963 Mon Sep 17 00:00:00 2001
++From f0547cae9be5480a6fcb67b7c1555a9d9830db06 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 3ef79a0,0000000..6a98269
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,26 -1,0 +1,26 @@@
- From 9ce7c75d542f0b5373f67a65f1e44e5c65a6d07c Mon Sep 17 00:00:00 2001
++From 62899a25be792d92564cc1d6f989ff648fc0a6ec 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
More information about the Python-modules-commits
mailing list