[Python-modules-commits] [mutagen] 06/06: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Sun Jul 3 22:27:25 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 92abb2d5de3d3878eaf278efe7ad6a88e8a53c5d
Merge: 3adfe33 b0ed8c9
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Mon Jul 4 00:21:29 2016 +0200
merge patched into master
MANIFEST.in | 10 +-
NEWS | 24 ++
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/use-rtd-package | 6 +-
debian/patches/use-system-inventory | 28 +-
docs/Makefile | 2 +-
docs/api/ape.rst | 6 +-
docs/api/asf.rst | 13 +-
docs/api/base.rst | 70 +++--
docs/api/flac.rst | 16 +-
docs/api/id3.rst | 7 +-
docs/api/index.rst | 4 +-
docs/api/monkeysaudio.rst | 1 +
docs/api/mp3.rst | 9 +-
docs/api/mp4.rst | 16 +-
docs/api/musepack.rst | 1 +
docs/api/ogg.rst | 6 +-
docs/api/oggflac.rst | 10 +-
docs/api/oggopus.rst | 9 +-
docs/api/oggspeex.rst | 9 +-
docs/api/oggtheora.rst | 9 +-
docs/api/oggvorbis.rst | 9 +-
docs/api/smf.rst | 4 +-
docs/api/trueaudio.rst | 6 +-
docs/api_notes.rst | 85 -------
docs/bugs.rst | 45 ----
docs/conf.py | 12 +-
docs/contact.rst | 4 +-
docs/images/Makefile | 29 +++
docs/images/favicon.ico | Bin 0 -> 34494 bytes
docs/images/logo.png | Bin 9155 -> 0 bytes
docs/index.rst | 35 ++-
docs/man/mid3v2.rst | 6 +-
docs/tutorial.rst | 359 --------------------------
docs/user/apev2.rst | 35 +++
docs/user/classes.rst | 101 ++++++++
docs/user/examples/fileobj-gio.py | 130 ++++++++++
docs/user/examples/fileobj-iface.py | 105 ++++++++
docs/user/filelike.rst | 43 ++++
docs/user/gettingstarted.rst | 90 +++++++
docs/user/id3.rst | 169 +++++++++++++
docs/user/index.rst | 17 ++
docs/user/mp4.rst | 17 ++
docs/user/padding.rst | 43 ++++
docs/user/vcomment.rst | 100 ++++++++
man/mid3v2.1 | 6 +-
mutagen/__init__.py | 4 +-
mutagen/_file.py | 146 +++++++----
mutagen/_tags.py | 61 +++--
mutagen/_util.py | 203 ++++++++++++++-
mutagen/_vorbis.py | 23 +-
mutagen/aac.py | 39 ++-
mutagen/aiff.py | 126 +++++----
mutagen/apev2.py | 140 ++++++----
mutagen/asf/__init__.py | 141 ++++++-----
mutagen/asf/_util.py | 2 +-
mutagen/easyid3.py | 28 +-
mutagen/easymp4.py | 15 +-
mutagen/flac.py | 282 ++++++++++++---------
mutagen/id3/__init__.py | 319 +++++++++++++----------
mutagen/id3/_frames.py | 8 +-
mutagen/id3/_specs.py | 5 +-
mutagen/id3/_util.py | 4 +-
mutagen/m4a.py | 9 +-
mutagen/monkeysaudio.py | 29 ++-
mutagen/mp3.py | 362 --------------------------
mutagen/mp3/__init__.py | 464 ++++++++++++++++++++++++++++++++++
mutagen/{_mp3util.py => mp3/_util.py} | 4 +-
mutagen/mp4/__init__.py | 152 ++++++-----
mutagen/mp4/_atom.py | 3 +
mutagen/musepack.py | 38 ++-
mutagen/ogg.py | 123 +++++----
mutagen/oggflac.py | 52 ++--
mutagen/oggopus.py | 50 +++-
mutagen/oggspeex.py | 58 +++--
mutagen/oggtheora.py | 52 +++-
mutagen/oggvorbis.py | 60 +++--
mutagen/optimfrog.py | 22 +-
mutagen/smf.py | 24 +-
mutagen/trueaudio.py | 44 +++-
mutagen/wavpack.py | 12 +-
setup.py | 26 +-
tests/data/CVE-2007-4619-1.flac | Bin 50904 -> 0 bytes
tests/data/CVE-2007-4619-12.flac | Bin 50904 -> 0 bytes
tests/data/CVE-2007-4619-2.flac | Bin 50904 -> 0 bytes
tests/data/image.jpg | Bin 0 -> 743 bytes
tests/test___init__.py | 298 +++++++++++++++++++++-
tests/test__id3frames.py | 65 ++---
tests/test__id3specs.py | 3 +
tests/test__util.py | 17 +-
tests/test__vorbis.py | 10 +-
tests/test_aiff.py | 2 +-
tests/test_apev2.py | 9 +-
tests/test_asf.py | 5 +-
tests/test_easyid3.py | 56 +++-
tests/test_easymp4.py | 3 +-
tests/test_flac.py | 86 +------
tests/test_id3.py | 13 +-
tests/test_mp3.py | 49 +++-
tests/test_mp4.py | 2 +-
tests/test_ogg.py | 6 +-
tests/test_oggflac.py | 12 +-
tests/test_oggopus.py | 6 +-
tests/test_oggspeex.py | 10 +-
tests/test_oggtheora.py | 12 +-
tests/test_oggvorbis.py | 10 +-
tests/test_tools_mid3v2.py | 31 +++
tests/test_trueaudio.py | 4 +-
tests/test_wavpack.py | 4 +-
tools/mid3v2 | 81 +++++-
111 files changed, 3654 insertions(+), 1984 deletions(-)
diff --cc debian/.git-dpm
index f58b3b8,0000000..9961d0b
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
- 86176e9f77235e6dde8e52da0af6de810d75a55c
- 86176e9f77235e6dde8e52da0af6de810d75a55c
- d51dc5c78e408c3c152d4625a64d1c0ea6ff2bb1
++b0ed8c9c3c4d55c24bd1bac05573e6f1a86adc24
++b0ed8c9c3c4d55c24bd1bac05573e6f1a86adc24
++d919475ac2eaf43d3246aeccffef00bae4e5ab63
+d919475ac2eaf43d3246aeccffef00bae4e5ab63
+mutagen_1.33.1.orig.tar.gz
+a15573dc6444aea3dd051ed9e3ef2051d5ba7f7d
+863868
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-rtd-package
index 374b2de,0000000..425160c
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,33 @@@
- From b09d866a8ad8e3d532427856dc80920fcc63557c Mon Sep 17 00:00:00 2001
++From b6402458646897cdf93092bd816de93d11f265c5 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 554fab6..2005945 100644
++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_)
- @@ -23,6 +24,8 @@ exclude_patterns = ['_build']
++@@ -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 c4ffff5,0000000..d1e3edf
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,25 -1,0 +1,29 @@@
- From 86176e9f77235e6dde8e52da0af6de810d75a55c Mon Sep 17 00:00:00 2001
++From b0ed8c9c3c4d55c24bd1bac05573e6f1a86adc24 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 | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
++ docs/conf.py | 7 +------
++ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 2005945..b9f6e5f 100644
++index ae92bd7..a9504c1 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -12,7 +12,8 @@ import mutagen
++@@ -11,12 +11,7 @@ import mutagen
++
+ needs_sphinx = "1.3"
+
- extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx', 'ext']
- -intersphinx_mapping = {'python': ('http://docs.python.org/2.7', None)}
- +intersphinx_mapping = {'python': ('http://docs.python.org/2.7',
- + '/usr/share/doc/python2.7/html/objects.inv')}
- source_suffix = '.rst'
- master_doc = 'index'
- project = 'mutagen'
++-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
More information about the Python-modules-commits
mailing list