[Python-modules-commits] [mutagen] 05/07: merge patched into master
Tristan Seligmann
mithrandi at moszumanska.debian.org
Sun May 22 07:45:46 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 4f51e508ed690027c610184c2ecdabb865d1b669
Merge: 073e9c6 86176e9
Author: Tristan Seligmann <mithrandi at debian.org>
Date: Sun May 22 04:27:02 2016 +0200
merge patched into master
NEWS | 25 ++++-
PKG-INFO | 4 +-
README.rst | 58 +----------
debian/.git-dpm | 6 +-
debian/patches/use-rtd-package | 38 ++-----
debian/patches/use-system-inventory | 8 +-
docs/api/base.rst | 5 +
docs/api/index.rst | 2 +-
docs/api/smf.rst | 11 ++
docs/conf.py | 8 +-
docs/contact.rst | 10 ++
docs/ext.py | 10 +-
docs/index.rst | 67 +++++-------
docs/man/index.rst | 27 ++++-
docs/tutorial.rst | 2 +-
mutagen/__init__.py | 6 +-
mutagen/_file.py | 8 +-
mutagen/_tags.py | 33 +++++-
mutagen/_vorbis.py | 2 +-
mutagen/asf/__init__.py | 4 +-
mutagen/asf/_objects.py | 29 +++++-
mutagen/easymp4.py | 4 +-
mutagen/flac.py | 6 +-
mutagen/id3/__init__.py | 12 +--
mutagen/id3/_frames.py | 45 +++++---
mutagen/id3/_specs.py | 17 ++-
mutagen/m4a.py | 4 +-
mutagen/mp4/__init__.py | 79 ++++++++------
mutagen/smf.py | 203 ++++++++++++++++++++++++++++++++++++
setup.py | 2 +-
tests/data/sample.mid | Bin 0 -> 8444 bytes
tests/quality/test_pep8.py | 2 +-
tests/quality/test_pyflakes.py | 3 +-
tests/test___init__.py | 4 +
tests/test__id3frames.py | 36 ++++++-
tests/test__id3specs.py | 9 +-
tests/test_aiff.py | 2 +
tests/test_apev2.py | 4 +-
tests/test_asf.py | 22 +++-
tests/test_easyid3.py | 4 +-
tests/test_flac.py | 4 +-
tests/test_id3.py | 53 +++++-----
tests/test_mp3.py | 2 +-
tests/test_mp4.py | 17 +--
tests/test_musepack.py | 2 +-
tests/test_ogg.py | 2 +-
tests/test_smf.py | 27 +++++
47 files changed, 655 insertions(+), 273 deletions(-)
diff --cc debian/.git-dpm
index 3eb7132,0000000..5995fc2
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
- 745319fd70881da36835c29f276cf9cd9002eaa3
- 745319fd70881da36835c29f276cf9cd9002eaa3
- e69cd238b36713890df9d153ca89f5e700ff0887
++86176e9f77235e6dde8e52da0af6de810d75a55c
++86176e9f77235e6dde8e52da0af6de810d75a55c
++d51dc5c78e408c3c152d4625a64d1c0ea6ff2bb1
+d51dc5c78e408c3c152d4625a64d1c0ea6ff2bb1
+mutagen_1.32.orig.tar.gz
+4006517ce55770639621d2880af9ffc3378569ad
+901717
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-rtd-package
index 29e49af,0000000..374b2de
mode 100644,000000..100644
--- a/debian/patches/use-rtd-package
+++ b/debian/patches/use-rtd-package
@@@ -1,55 -1,0 +1,33 @@@
- From 7cc32bfb926862edd4e24726b6301bfd157d0da3 Mon Sep 17 00:00:00 2001
++From b09d866a8ad8e3d532427856dc80920fcc63557c 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/Makefile | 12 +++---------
- docs/conf.py | 3 +++
- 2 files changed, 6 insertions(+), 9 deletions(-)
++ docs/conf.py | 3 +++
++ 1 file changed, 3 insertions(+)
+
- diff --git a/docs/Makefile b/docs/Makefile
- index 473139b..3720e52 100644
- --- a/docs/Makefile
- +++ b/docs/Makefile
- @@ -1,13 +1,7 @@
- -all: _rtd_theme
- - sphinx-build -E -Dhtml_theme=_rtd_theme -Dhtml_theme_path=. -b html -n . _build
- +all:
- + sphinx-build -E -b html -n . _build
-
- clean:
- - rm -rf _build _rtd_theme
- + rm -rf _build
-
- .PHONY: clean
- -
- -_rtd_theme:
- - wget https://github.com/snide/sphinx_rtd_theme/archive/master.tar.gz
- - tar --strip-components=1 -zxvf master.tar.gz sphinx_rtd_theme-master/sphinx_rtd_theme
- - mv sphinx_rtd_theme _rtd_theme
- - rm master.tar.gz
+diff --git a/docs/conf.py b/docs/conf.py
- index 10ceb0d..3b1369b 100644
++index 554fab6..2005945 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_)
- @@ -21,6 +22,8 @@ release = mutagen.version_string
- exclude_patterns = ['_build']
- bug_url_template = "http://bitbucket.org/lazka/mutagen/issue/%s"
- pr_url_template = "http://bitbucket.org/lazka/mutagen/pull-request/%s"
++@@ -23,6 +24,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 515a83f,0000000..c4ffff5
mode 100644,000000..100644
--- a/debian/patches/use-system-inventory
+++ b/debian/patches/use-system-inventory
@@@ -1,25 -1,0 +1,25 @@@
- From 745319fd70881da36835c29f276cf9cd9002eaa3 Mon Sep 17 00:00:00 2001
++From 86176e9f77235e6dde8e52da0af6de810d75a55c 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(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index 3b1369b..76c3fff 100644
++index 2005945..b9f6e5f 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
- @@ -11,7 +11,8 @@ import mutagen
-
++@@ -12,7 +12,8 @@ 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'
--
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