[Python-modules-commits] [mutagen] 06/07: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Fri Dec 16 09:33:41 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 969f927d9f74d61fe074e5c904ff4da287d2ecb2
Merge: 60f24d9 015e068
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Fri Dec 16 11:14:48 2016 +0200
merge patched into master
MANIFEST.in | 2 +
NEWS | 22 +
PKG-INFO | 25 +-
README.rst | 15 +-
debian/.git-dpm | 6 +-
debian/patches/use-rtd-package | 6 +-
debian/patches/use-system-inventory | 6 +-
docs/conf.py | 4 +-
docs/id3_frames_gen.py | 10 +-
docs/index.rst | 15 +-
mutagen/__init__.py | 2 +-
mutagen/_senf/README.rst | 1 +
mutagen/_senf/__init__.py | 82 ++++
mutagen/_senf/_argv.py | 46 ++
mutagen/_senf/_compat.py | 52 +++
mutagen/_senf/_environ.py | 238 +++++++++++
mutagen/_senf/_fsnative.py | 420 +++++++++++++++++++
mutagen/_senf/_print.py | 352 ++++++++++++++++
mutagen/_senf/_stdlib.py | 146 +++++++
mutagen/_senf/_temp.py | 90 ++++
mutagen/_senf/_winansi.py | 311 ++++++++++++++
mutagen/_senf/_winapi.py | 183 ++++++++
mutagen/_tools/__init__.py | 6 +
mutagen/_tools/_util.py | 94 +++++
tools/mid3cp => mutagen/_tools/mid3cp.py | 17 +-
tools/mid3iconv => mutagen/_tools/mid3iconv.py | 19 +-
tools/mid3v2 => mutagen/_tools/mid3v2.py | 100 +++--
tools/moggsplit => mutagen/_tools/moggsplit.py | 16 +-
.../_tools/mutagen_inspect.py | 20 +-
.../mutagen-pony => mutagen/_tools/mutagen_pony.py | 13 +-
mutagen/_toolsutil.py | 231 ----------
mutagen/_util.py | 2 +-
mutagen/asf/__init__.py | 5 +-
mutagen/asf/_util.py | 2 +-
mutagen/id3/_frames.py | 66 +--
mutagen/id3/_specs.py | 37 +-
mutagen/id3/_tags.py | 61 ++-
mutagen/mp3/__init__.py | 10 +-
mutagen/mp4/__init__.py | 1 -
setup.py | 55 ++-
tests/__init__.py | 130 +-----
tests/quality/test_pep8.py | 46 +-
tests/quality/test_pyflakes.py | 18 +-
tests/test___init__.py | 14 +-
tests/test__id3frames.py | 40 +-
tests/test_asf.py | 10 +-
tests/test_encoding.py | 2 +-
tests/test_id3.py | 43 +-
tests/test_mp4.py | 2 +-
tests/test_tools.py | 22 +-
tests/test_tools_mid3cp.py | 8 +-
tests/test_tools_mid3iconv.py | 2 +-
tests/test_tools_mid3v2.py | 4 +-
tests/test_tools_moggsplit.py | 2 +-
tests/test_tools_mutagen_inspect.py | 2 +-
tests/test_tools_mutagen_pony.py | 4 +-
tests/{test__toolsutil.py => test_tools_util.py} | 12 +-
tools/mid3cp | 116 +-----
tools/mid3iconv | 159 +------
tools/mid3v2 | 463 +--------------------
tools/moggsplit | 66 +--
tools/mutagen-inspect | 36 +-
tools/mutagen-pony | 107 +----
63 files changed, 2503 insertions(+), 1594 deletions(-)
diff --cc debian/.git-dpm
index c922089,0000000..fe5112c
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
- 615d40fb19aae3aa90918cd912d8465a90dd6798
- 615d40fb19aae3aa90918cd912d8465a90dd6798
- d905cbef7fd30162f83506cdd3dfe5177b4df9f1
++015e068aca8144f7a69bd13e59d95f1e7f609306
++015e068aca8144f7a69bd13e59d95f1e7f609306
++c4d908388c34fb66492a01316b4933c29776c5cb
+c4d908388c34fb66492a01316b4933c29776c5cb
+mutagen_1.35.1.orig.tar.gz
+7c5991c6c175ead0088d5852ba7c215f3861111d
+883772
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-rtd-package
index afc9b99,0000000..ab06a8b
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,33 @@@
- From 343d73375a90da24559821d9790dbb45f810db11 Mon Sep 17 00:00:00 2001
++From e1849a4f707eea4aecd27f270d7b56495b5f4b01 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
++index 40faa34..1647baa 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']
++@@ -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 707bc80,0000000..c9a0727
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,26 -1,0 +1,26 @@@
- From 615d40fb19aae3aa90918cd912d8465a90dd6798 Mon Sep 17 00:00:00 2001
++From 015e068aca8144f7a69bd13e59d95f1e7f609306 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
++index 1647baa..c627d7d 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -18,8 +18,8 @@ extensions = [
++@@ -17,8 +17,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