[Python-modules-commits] [mutagen] 05/06: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Mon Dec 26 12:37:36 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 257a12efd7b5e0deb66301947743ef8ab0a201e2
Merge: abf8796 3d58aa3
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Mon Dec 26 14:18:14 2016 +0200
merge patched into master
NEWS | 11 ++
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
debian/patches/use-rtd-package | 2 +-
debian/patches/use-system-inventory | 2 +-
docs/man/mid3cp.rst | 4 +
man/mid3cp.1 | 4 +
mutagen/__init__.py | 2 +-
mutagen/_senf/__init__.py | 2 +-
mutagen/_senf/_argv.py | 77 ++++++++-
mutagen/_senf/_compat.py | 8 +-
mutagen/_senf/_environ.py | 31 +++-
mutagen/_senf/_fsnative.py | 314 +++++++++++++++++++++++++++++-------
mutagen/_senf/_print.py | 13 +-
mutagen/_senf/_temp.py | 6 +-
mutagen/_tools/mid3cp.py | 61 ++++---
mutagen/_tools/mid3v2.py | 13 +-
mutagen/easyid3.py | 30 +++-
mutagen/flac.py | 7 +
mutagen/id3/_specs.py | 10 +-
mutagen/id3/_tags.py | 44 ++++-
mutagen/mp4/__init__.py | 20 ++-
tests/test__id3frames.py | 13 ++
tests/test__id3specs.py | 10 +-
tests/test_easyid3.py | 46 +++++-
tests/test_flac.py | 11 ++
tests/test_id3.py | 10 ++
tests/test_mp4.py | 24 ++-
tests/test_tools_mid3cp.py | 35 ++++
29 files changed, 667 insertions(+), 151 deletions(-)
diff --cc debian/.git-dpm
index aa61188,0000000..66051fe
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
- 015e068aca8144f7a69bd13e59d95f1e7f609306
- 015e068aca8144f7a69bd13e59d95f1e7f609306
- c4d908388c34fb66492a01316b4933c29776c5cb
++3d58aa32f4baae54f63b8d866a6e7a390f1baaab
++3d58aa32f4baae54f63b8d866a6e7a390f1baaab
++5d35b4f7cd0a01ec8e6d160fa9bbf076e2dbae6d
+5d35b4f7cd0a01ec8e6d160fa9bbf076e2dbae6d
+mutagen_1.36.orig.tar.gz
+1c9e7f1eed007bcf4706d315399ea2431a99b1c6
+888238
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-rtd-package
index ab06a8b,0000000..3e31f19
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,33 -1,0 +1,33 @@@
- From e1849a4f707eea4aecd27f270d7b56495b5f4b01 Mon Sep 17 00:00:00 2001
++From 59af603923dba63a9976f92208d9ae042d8539e7 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 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_)
+@@ -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 c9a0727,0000000..455785b
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,26 -1,0 +1,26 @@@
- From 015e068aca8144f7a69bd13e59d95f1e7f609306 Mon Sep 17 00:00:00 2001
++From 3d58aa32f4baae54f63b8d866a6e7a390f1baaab 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
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -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