[Python-modules-commits] [mutagen] 06/12: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Tue Aug 8 02:38:41 UTC 2017
This is an automated email from the git hooks/post-receive script.
mithrandi pushed a commit to branch master
in repository mutagen.
commit 6fa237f377b77fc4192b80b4d954109efd081362
Merge: 6aa2501 8e49a2d
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Tue Aug 8 03:28:09 2017 +0200
merge patched into master
MANIFEST.in | 2 +-
NEWS | 61 ++++-
PKG-INFO | 13 +-
README.rst | 9 +-
debian/.git-dpm | 6 +-
debian/patches/use-rtd-package | 17 +-
debian/patches/use-system-inventory | 6 +-
docs/api/dsf.rst | 11 +
docs/api/id3_frames.rst | 21 +-
docs/api/index.rst | 1 +
docs/conf.py | 25 +-
docs/ext.py | 36 ---
docs/extra.css | 32 +++
docs/id3_frames_gen.py | 5 +-
docs/index.rst | 10 +-
docs/user/examples/fileobj-gio.py | 5 +-
docs/user/id3.rst | 54 ++++
mutagen/__init__.py | 9 +-
mutagen/_compat.py | 6 +-
mutagen/_constants.py | 5 +
mutagen/_file.py | 10 +-
mutagen/_tags.py | 5 +-
mutagen/_tools/__init__.py | 5 +-
mutagen/_tools/_util.py | 5 +-
mutagen/_tools/mid3cp.py | 7 +-
mutagen/_tools/mid3iconv.py | 10 +-
mutagen/_tools/mid3v2.py | 8 +-
mutagen/_tools/moggsplit.py | 8 +-
mutagen/_tools/mutagen_inspect.py | 8 +-
mutagen/_tools/mutagen_pony.py | 5 +-
mutagen/_util.py | 79 +++++-
mutagen/_vorbis.py | 8 +-
mutagen/aac.py | 5 +-
mutagen/aiff.py | 6 +-
mutagen/apev2.py | 6 +-
mutagen/asf/__init__.py | 5 +-
mutagen/asf/_attrs.py | 5 +-
mutagen/asf/_objects.py | 5 +-
mutagen/asf/_util.py | 5 +-
mutagen/dsf.py | 358 +++++++++++++++++++++++++++
mutagen/easyid3.py | 6 +-
mutagen/easymp4.py | 6 +-
mutagen/flac.py | 19 +-
mutagen/id3/__init__.py | 6 +-
mutagen/id3/_file.py | 6 +-
mutagen/id3/_frames.py | 31 ++-
mutagen/id3/_id3v1.py | 6 +-
mutagen/id3/_specs.py | 16 +-
mutagen/id3/_tags.py | 5 +-
mutagen/id3/_util.py | 6 +-
mutagen/m4a.py | 5 +-
mutagen/monkeysaudio.py | 6 +-
mutagen/mp3/__init__.py | 27 +-
mutagen/mp3/_util.py | 118 ++++++++-
mutagen/mp4/__init__.py | 103 ++++++--
mutagen/mp4/_as_entry.py | 5 +-
mutagen/mp4/_atom.py | 6 +-
mutagen/mp4/_util.py | 5 +-
mutagen/musepack.py | 6 +-
mutagen/ogg.py | 30 ++-
mutagen/oggflac.py | 10 +-
mutagen/oggopus.py | 8 +-
mutagen/oggspeex.py | 8 +-
mutagen/oggtheora.py | 8 +-
mutagen/oggvorbis.py | 8 +-
mutagen/optimfrog.py | 6 +-
mutagen/smf.py | 5 +-
mutagen/trueaudio.py | 6 +-
mutagen/wavpack.py | 6 +-
setup.py | 5 +-
tests/__init__.py | 26 +-
tests/data/2822400-1ch-0s-silence.dsf | Bin 0 -> 4188 bytes
tests/data/5644800-2ch-s01-silence.dsf | Bin 0 -> 112988 bytes
tests/data/audacious-trailing-id32-apev2.mp3 | Bin 0 -> 2906 bytes
tests/data/audacious-trailing-id32-id31.mp3 | Bin 0 -> 15272 bytes
tests/data/lame397v9short.mp3 | Bin 0 -> 552 bytes
tests/data/with-id3.dsf | Bin 0 -> 1147 bytes
tests/data/without-id3.dsf | Bin 0 -> 4188 bytes
tests/quality/__init__.py | 5 +-
tests/quality/test_pep8.py | 53 ++--
tests/quality/test_pyflakes.py | 5 +-
tests/test___init__.py | 9 +
tests/test__id3frames.py | 6 +
tests/test__id3specs.py | 9 +-
tests/test__util.py | 59 ++++-
tests/test_dsf.py | 124 ++++++++++
tests/test_encoding.py | 5 +-
tests/test_flac.py | 9 +
tests/test_id3.py | 35 ++-
tests/test_mp3.py | 89 ++++++-
tests/test_mp4.py | 39 ++-
tests/test_ogg.py | 43 ++++
tests/test_tools_mid3cp.py | 8 +-
tools/mid3cp | 5 +-
tools/mid3iconv | 5 +-
tools/mid3v2 | 5 +-
tools/moggsplit | 5 +-
tools/mutagen-inspect | 5 +-
tools/mutagen-pony | 5 +-
99 files changed, 1578 insertions(+), 351 deletions(-)
diff --cc debian/.git-dpm
index bb216f6,0000000..2272704
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
- 3d58aa32f4baae54f63b8d866a6e7a390f1baaab
- 3d58aa32f4baae54f63b8d866a6e7a390f1baaab
- 5d35b4f7cd0a01ec8e6d160fa9bbf076e2dbae6d
++8e49a2d571d5138a730a4eab035671d90a139016
++8e49a2d571d5138a730a4eab035671d90a139016
++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-rtd-package
index 3e31f19,0000000..fa03919
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,24 @@@
- From 59af603923dba63a9976f92208d9ae042d8539e7 Mon Sep 17 00:00:00 2001
++From dfab641acb417e131fd37702cb70cd99621d20af 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(+)
++ docs/conf.py | 1 +
++ 1 file changed, 1 insertion(+)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 40faa34..1647baa 100644
++index 4bc64da..23d719a 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_)
- @@ -29,6 +30,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 455785b,0000000..32128ae
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,26 -1,0 +1,26 @@@
- From 3d58aa32f4baae54f63b8d866a6e7a390f1baaab Mon Sep 17 00:00:00 2001
++From 8e49a2d571d5138a730a4eab035671d90a139016 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 1647baa..c627d7d 100644
++index 23d719a..f55835f 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -17,8 +17,8 @@ extensions = [
- 'ext',
++ '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'),
+ }
+ 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