[Python-apps-commits] r14284 - in packages/beets/trunk/debian (12 files)
rak at users.alioth.debian.org
rak at users.alioth.debian.org
Thu Jul 27 20:36:16 UTC 2017
Date: Thursday, July 27, 2017 @ 20:36:14
Author: rak
Revision: 14284
Preparing 1.4.5-1
Modified:
packages/beets/trunk/debian/beets.install
packages/beets/trunk/debian/beets.links
packages/beets/trunk/debian/changelog
packages/beets/trunk/debian/control
packages/beets/trunk/debian/copyright
packages/beets/trunk/debian/patches/series
packages/beets/trunk/debian/patches/skip-test_query-path-tests
packages/beets/trunk/debian/rules
Deleted:
packages/beets/trunk/debian/patches/fix-test_hidden
packages/beets/trunk/debian/patches/fix-test_mediafile_edge
packages/beets/trunk/debian/patches/fix-test_nonexistent_file
packages/beets/trunk/debian/patches/no-jellyfish
Modified: packages/beets/trunk/debian/beets.install
===================================================================
--- packages/beets/trunk/debian/beets.install 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/beets.install 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,2 +1,2 @@
-usr/bin/*
usr/share/beets/*
+extra/_beet /usr/share/zsh/vendor-completions/
Modified: packages/beets/trunk/debian/beets.links
===================================================================
--- packages/beets/trunk/debian/beets.links 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/beets.links 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,3 +1,4 @@
/usr/share/javascript/backbone/backbone.js /usr/share/beets/beetsplug/web/static/backbone.js
/usr/share/javascript/jquery/jquery.js /usr/share/beets/beetsplug/web/static/jquery.js
/usr/share/javascript/underscore/underscore.js /usr/share/beets/beetsplug/web/static/underscore.js
+/usr/share/beets/beet /usr/bin/beet
Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/changelog 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,3 +1,33 @@
+beets (1.4.5-1) UNRELEASED; urgency=medium
+
+ * Team upload
+ * New upstream release (Closes: #852257)
+ + version number displayed by beets now agrees with the Debian package
+ version (Closes: #837193)
+ + Fixes issues with broken utf8 filenames (Closes: #851630)
+
+ [ Ryan Kavanagh ]
+ * Bumped standards version to 4.0.0
+ * Switch to Python 3 now that it's supported by upstream. (Closes: #849085)
+ + Update the (build-)dependencies accordingly.
+ + Specify that we're using pybuild in the rules
+ + Drop (build-)dependencies on python-enum34, python-imaging, and
+ python-pathlib: these are no longer needed with Python 3.
+ + We require at least Python 3.4 if we are to drop python-enum34; set
+ X-Python3-Version and other dependency versions accordingly.
+ * Refreshed patches, and dropped the following unneeded patches:
+ fix-test_hidden, fix-test_mediafile_edge, fix-test_nonexistent_file,
+ no-jellyfish
+ * Because #806716 has been resolved, added a build-dependency on
+ python3-jellyfish; this justifies dropping the no-jellyfish patch.
+ * Fixed insecure URLs for Vcs-Browser; no secure alternative exists for
+ Vcs-Svn
+ * Updated copyright holders
+ * Added myself to the uploaders field
+ * Install zsh completion file (Closes: #775811)
+
+ -- Ryan Kavanagh <rak at debian.org> Thu, 27 Jul 2017 10:05:12 -0400
+
beets (1.3.19-2) unstable; urgency=medium
* Fix occasional FTBFS due to lack of mock cleanup. Thanks Santiago Vila.
Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/control 2017-07-27 20:36:14 UTC (rev 14284)
@@ -4,34 +4,34 @@
Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
Uploaders:
Stefano Rivera <stefanor at debian.org>,
- Simon Chopin <chopin.simon at gmail.com>
+ Simon Chopin <chopin.simon at gmail.com>,
+ Ryan Kavanagh <rak at debian.org>
Build-Depends:
debhelper (>= 9),
dh-python,
libc-bin (>= 2.13),
- python-all (>= 2.6.6-3~),
- python-bs4,
- python-enum34 (>= 1.0.4),
- python-flask,
- python-mock,
- python-mpd,
- python-munkres,
- python-musicbrainzngs (>= 0.4),
- python-mutagen (>= 1.27),
- python-pathlib,
- python-pylast,
- python-rarfile,
- python-responses,
- python-setuptools,
- python-sphinx (>= 1.0.7+dfsg),
- python-unidecode,
- python-xdg,
- python-yaml
-X-Python-Version: >= 2.7
-Standards-Version: 3.9.8
+ python3-all (>= 3.4),
+ python3-bs4,
+ python3-flask,
+ python3-jellyfish,
+ python3-mock,
+ python3-mpd,
+ python3-munkres,
+ python3-musicbrainzngs (>= 0.4),
+ python3-mutagen (>= 1.27),
+ python3-pylast,
+ python3-rarfile,
+ python3-responses,
+ python3-setuptools,
+ python3-sphinx (>= 1.0.7+dfsg),
+ python3-unidecode,
+ python3-xdg,
+ python3-yaml
+Standards-Version: 4.0.0
+X-Python3-Version: >= 3.4
Homepage: http://beets.radbox.org/
Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/beets/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-apps/packages/beets/trunk/
+Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/beets/trunk/
Package: beets
Architecture: all
@@ -39,29 +39,26 @@
libjs-backbone,
libjs-jquery,
libjs-underscore,
- python-enum34,
- python-musicbrainzngs (>= 0.4),
- python-mutagen (>= 1.21),
- python-pkg-resources,
+ python3-musicbrainzngs (>= 0.4),
+ python3-mutagen (>= 1.21),
+ python3-pkg-resources,
${misc:Depends},
- ${python:Depends}
+ ${python3:Depends}
Suggests:
beets-doc,
libav-tools,
mp3gain,
- python-acoustid,
- python-bs4,
- python-dbus,
- python-flask,
- python-gst-1.0,
- python-imaging,
- python-mpd,
- python-pathlib,
- python-pylast,
- python-rarfile,
- python-requests,
- python-requests-oauthlib,
- python-xdg
+ python3-acoustid,
+ python3-bs4,
+ python3-dbus,
+ python3-flask,
+ python3-gst-1.0,
+ python3-mpd,
+ python3-pylast,
+ python3-rarfile,
+ python3-requests,
+ python3-requests-oauthlib,
+ python3-xdg
Description: music tagger and library organizer
Beets is a media library management system for obsessive-compulsive music
geeks.
Modified: packages/beets/trunk/debian/copyright
===================================================================
--- packages/beets/trunk/debian/copyright 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/copyright 2017-07-27 20:36:14 UTC (rev 14284)
@@ -4,7 +4,7 @@
Source: http://beets.radbox.org/
Files: *
-Copyright: 2010-2016, Adrian Sampson <adrian at radbox.org>
+Copyright: 2010-2017, Adrian Sampson <adrian at radbox.org>
2012-2016, Fabrice Laporte
2013-2016, Thomas Scholtes
License: Expat
@@ -27,18 +27,22 @@
2016, Malte Ried
2016, Matt Lichtenberg
2015-2016, Ohm Patel
+ 2017, Pauli Kettunen
2013-2016, Pedro Silva
2013-2016, Peter Schnebel
2011-2016, Philippe Mongeau
+ 2017, Quentin Young
+ 2016, Pieter Mulder
2016, Rafael Bodill <http://github.com/rafi>
2014-2016, Thomas Scholtes
+ 2017, Tigran Kostandyan
2016, Tom Jaspers
2013-2016, Verrus <github.com/Verrus/beets-plugin-featInTitle>
2014-2016, Yevgeny Bezman
License: Expat
Files: beetsplug/mbcollection.py
-Copyright: 2011, Jeffrey Aylesworth <jeffrey at aylesworth.ca>
+Copyright: 2011, Jeffrey Aylesworth <mail at jeffrey.red>
License: ISC
Files: beetsplug/web/static/backbone.js
@@ -57,6 +61,7 @@
Files: debian/*
Copyright: 2010-2016, Stefano Rivera <stefanor at debian.org>
2012-2014, Simon Chopin <chopin.simon at gmail.com>
+ 2017, Ryan Kavanagh <rak at debian.org>
License: Expat
License: Expat
Deleted: packages/beets/trunk/debian/patches/fix-test_hidden
===================================================================
--- packages/beets/trunk/debian/patches/fix-test_hidden 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/patches/fix-test_hidden 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,17 +0,0 @@
-Description: test_hidden was missing suite() which made testall.suite() fail
-Author: Christoph Reiter <reiter.christoph at gmail.com>
-Origin: upstream, https://github.com/beetbox/beets/commit/06072c5d7d2bc33a9a7cf041b8fc5bd362758a69
-
---- a/test/test_hidden.py
-+++ b/test/test_hidden.py
-@@ -72,3 +72,10 @@
-
- with tempfile.NamedTemporaryFile(prefix='.tmp') as f:
- self.assertTrue(hidden.is_hidden(f.name))
-+
-+
-+def suite():
-+ return unittest.TestLoader().loadTestsFromName(__name__)
-+
-+if __name__ == '__main__':
-+ unittest.main(defaultTest='suite')
Deleted: packages/beets/trunk/debian/patches/fix-test_mediafile_edge
===================================================================
--- packages/beets/trunk/debian/patches/fix-test_mediafile_edge 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/patches/fix-test_mediafile_edge 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,15 +0,0 @@
-Description: A different exception is now returned for unreadable files
-Origin: upstream, https://github.com/beetbox/beets/pull/2088
-Author: Christoph Reiter <reiter.christoph at gmail.com>
-
---- a/test/test_mediafile_edge.py
-+++ b/test/test_mediafile_edge.py
-@@ -192,7 +192,7 @@
- fn = os.path.join(_common.RSRC, b'brokenlink')
- os.symlink('does_not_exist', fn)
- try:
-- self.assertRaises(IOError,
-+ self.assertRaises(beets.mediafile.UnreadableFileError,
- beets.mediafile.MediaFile, fn)
- finally:
- os.unlink(fn)
Deleted: packages/beets/trunk/debian/patches/fix-test_nonexistent_file
===================================================================
--- packages/beets/trunk/debian/patches/fix-test_nonexistent_file 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/patches/fix-test_nonexistent_file 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,34 +0,0 @@
-Description: Manage patching of try_filesize
-Author: Jesse Weinstein <jesse at wefu.org>
-Origin: upstream, https://github.com/beetbox/beets/issues/2137
-Bug-Debian: https://bugs.debian.org/835937
-Bug-Upstream: https://github.com/beetbox/beets/issues/2135
-
---- a/test/test_ui.py
-+++ b/test/test_ui.py
-@@ -24,7 +24,7 @@ import subprocess
- import platform
- from copy import deepcopy
-
--from mock import patch
-+from mock import patch, Mock
- from test import _common
- from test._common import unittest
- from test.helper import capture_stdout, has_program, TestHelper, control_stdin
-@@ -1053,6 +1053,7 @@ class ShowChangeTest(_common.TestCase):
- u'caf.mp3 ->' in msg)
-
-
-+ at patch('beets.library.Item.try_filesize', Mock(return_value=987))
- class SummarizeItemsTest(_common.TestCase):
- def setUp(self):
- super(SummarizeItemsTest, self).setUp()
-@@ -1061,8 +1062,6 @@ class SummarizeItemsTest(_common.TestCase):
- item.length = 10 * 60 + 54
- item.format = "F"
- self.item = item
-- fsize_mock = patch('beets.library.Item.try_filesize').start()
-- fsize_mock.return_value = 987
-
- def test_summarize_item(self):
- summary = commands.summarize_items([], True)
Deleted: packages/beets/trunk/debian/patches/no-jellyfish
===================================================================
--- packages/beets/trunk/debian/patches/no-jellyfish 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/patches/no-jellyfish 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,86 +0,0 @@
-Description: Bundle levenshtein_distance from jellyfish
- Debian already has a Python library called jellyfish. While we resolve that
- problem, let's avoid the need for re-packaging jellyfish.
-Bug-Debian: https://bugs.debian.org/806716
-Author: Stefano Rivera <stefanor at debian.org>
-
---- a/beets/autotag/hooks.py
-+++ b/beets/autotag/hooks.py
-@@ -25,7 +25,7 @@
- from beets import config
- from beets.util import as_string
- from beets.autotag import mb
--from jellyfish import levenshtein_distance
-+from beets.util._jellyfish import levenshtein_distance
- from unidecode import unidecode
-
- log = logging.getLogger('beets')
---- /dev/null
-+++ b/beets/util/_jellyfish.py
-@@ -0,0 +1,56 @@
-+# Borrowed from Jellyfish (https://github.com/jamesturk/jellyfish)
-+# Copyright (c) 2015, James Turk
-+# Copyright (c) 2015, Sunlight Foundation
-+#
-+# All rights reserved.
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions are met:
-+#
-+# * Redistributions of source code must retain the above copyright notice,
-+# this list of conditions and the following disclaimer.
-+# * Redistributions in binary form must reproduce the above copyright
-+# notice, this list of conditions and the following disclaimer in the
-+# documentation and/or other materials provided with the distribution.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+# POSSIBILITY OF SUCH DAMAGE.
-+
-+_range = xrange
-+_no_bytes_err = 'expected unicode, got str'
-+
-+
-+def levenshtein_distance(s1, s2):
-+ if isinstance(s1, bytes) or isinstance(s2, bytes):
-+ raise TypeError(_no_bytes_err)
-+
-+ if s1 == s2:
-+ return 0
-+ rows = len(s1)+1
-+ cols = len(s2)+1
-+
-+ if not s1:
-+ return cols-1
-+ if not s2:
-+ return rows-1
-+
-+ prev = None
-+ cur = range(cols)
-+ for r in _range(1, rows):
-+ prev, cur = cur, [r] + [0]*(cols-1)
-+ for c in _range(1, cols):
-+ deletion = prev[c] + 1
-+ insertion = cur[c-1] + 1
-+ edit = prev[c-1] + (0 if s1[r-1] == s2[c-1] else 1)
-+ cur[c] = min(edit, deletion, insertion)
-+
-+ return cur[-1]
---- a/setup.py
-+++ b/setup.py
-@@ -92,7 +92,6 @@
- 'unidecode',
- 'musicbrainzngs>=0.4',
- 'pyyaml',
-- 'jellyfish',
- ] + (['colorama'] if (sys.platform == 'win32') else []),
-
- tests_require=[
Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/patches/series 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,5 +1 @@
-fix-test_hidden
-no-jellyfish
-fix-test_mediafile_edge
-fix-test_nonexistent_file
skip-test_query-path-tests
Modified: packages/beets/trunk/debian/patches/skip-test_query-path-tests
===================================================================
--- packages/beets/trunk/debian/patches/skip-test_query-path-tests 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/patches/skip-test_query-path-tests 2017-07-27 20:36:14 UTC (rev 14284)
@@ -4,9 +4,11 @@
Author: Stefano Rivera <stefanor at debian.org>
Bug-Upstream: https://github.com/beetbox/beets/issues/2172
---- a/test/test_query.py
-+++ b/test/test_query.py
-@@ -411,6 +411,7 @@
+Index: beets-1.4.5/test/test_query.py
+===================================================================
+--- beets-1.4.5.orig/test/test_query.py 2017-07-27 10:32:38.163022921 -0400
++++ beets-1.4.5/test/test_query.py 2017-07-27 10:32:38.159022898 -0400
+@@ -412,6 +412,7 @@
self.patcher_samefile.stop()
self.patcher_exists.stop()
@@ -14,7 +16,7 @@
def test_path_exact_match(self):
q = u'path:/a/b/c.mp3'
results = self.lib.items(q)
-@@ -419,6 +420,7 @@
+@@ -420,6 +421,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [])
@@ -22,7 +24,7 @@
def test_parent_directory_no_slash(self):
q = u'path:/a'
results = self.lib.items(q)
-@@ -427,6 +429,7 @@
+@@ -428,6 +430,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [u'path album'])
@@ -30,7 +32,7 @@
def test_parent_directory_with_slash(self):
q = u'path:/a/'
results = self.lib.items(q)
-@@ -451,6 +454,7 @@
+@@ -452,6 +455,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [])
@@ -38,7 +40,7 @@
def test_nonnorm_path(self):
q = u'path:/x/../a/b'
results = self.lib.items(q)
-@@ -459,6 +463,7 @@
+@@ -460,6 +464,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [u'path album'])
@@ -46,7 +48,7 @@
def test_slashed_query_matches_path(self):
q = u'/a/b'
results = self.lib.items(q)
-@@ -496,6 +501,7 @@
+@@ -497,6 +502,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [u'path album'])
@@ -54,7 +56,7 @@
def test_escape_underscore(self):
self.add_album(path=b'/a/_/title.mp3', title=u'with underscore',
album=u'album with underscore')
-@@ -506,6 +512,7 @@
+@@ -507,6 +513,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [u'album with underscore'])
@@ -62,7 +64,7 @@
def test_escape_percent(self):
self.add_album(path=b'/a/%/title.mp3', title=u'with percent',
album=u'album with percent')
-@@ -516,6 +523,7 @@
+@@ -517,6 +524,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [u'album with percent'])
@@ -70,7 +72,7 @@
def test_escape_backslash(self):
self.add_album(path=br'/a/\x/title.mp3', title=u'with backslash',
album=u'album with backslash')
-@@ -526,6 +534,7 @@
+@@ -527,6 +535,7 @@
results = self.lib.albums(q)
self.assert_albums_matched(results, [u'album with backslash'])
Modified: packages/beets/trunk/debian/rules
===================================================================
--- packages/beets/trunk/debian/rules 2017-07-20 16:07:28 UTC (rev 14283)
+++ packages/beets/trunk/debian/rules 2017-07-27 20:36:14 UTC (rev 14284)
@@ -1,7 +1,9 @@
#!/usr/bin/make -f
+export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/beets/ --install-scripts=/usr/share/beets/
+
%:
- dh $@ --with python2,sphinxdoc
+ dh $@ --with python3,sphinxdoc --buildsystem=pybuild
override_dh_auto_build:
dh_auto_build
@@ -19,14 +21,6 @@
done
endif
-override_dh_auto_install:
- dh_auto_install -- --install-lib=/usr/share/beets/
-
-override_dh_install:
- dh_install
- mv debian/beets/usr/bin/beet debian/beets/usr/share/beets
- dh_link /usr/share/beets/beet /usr/bin/beet
-
override_dh_auto_clean:
dh_auto_clean
rm -rf build
More information about the Python-apps-commits
mailing list