diff -Nru beets-1.4.6/debian/beets-doc.docs beets-1.4.6/debian/beets-doc.docs --- beets-1.4.6/debian/beets-doc.docs 2012-05-19 18:31:19.000000000 +0000 +++ beets-1.4.6/debian/beets-doc.docs 2018-03-12 22:20:40.000000000 +0000 @@ -1 +1 @@ -build/docs/html +docs/_build/html diff -Nru beets-1.4.6/debian/beets.install beets-1.4.6/debian/beets.install --- beets-1.4.6/debian/beets.install 2017-07-27 20:36:14.000000000 +0000 +++ beets-1.4.6/debian/beets.install 2018-03-12 22:20:40.000000000 +0000 @@ -1,2 +1,2 @@ -usr/share/beets/* extra/_beet /usr/share/zsh/vendor-completions/ +usr/share/beets/* diff -Nru beets-1.4.6/debian/beets.links beets-1.4.6/debian/beets.links --- beets-1.4.6/debian/beets.links 2017-07-27 20:36:14.000000000 +0000 +++ beets-1.4.6/debian/beets.links 2018-03-12 22:20:40.000000000 +0000 @@ -1,4 +1,4 @@ +/usr/share/beets/beet /usr/bin/beet /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 diff -Nru beets-1.4.6/debian/changelog beets-1.4.6/debian/changelog --- beets-1.4.6/debian/changelog 2018-03-12 10:31:56.000000000 +0000 +++ beets-1.4.6/debian/changelog 2018-03-12 22:20:40.000000000 +0000 @@ -1,9 +1,34 @@ -beets (1.4.6-1ubuntu1) bionic; urgency=medium +beets (1.4.6-2) unstable; urgency=medium + [ Stefano Rivera ] + * Thanks for the NMU, Matthias. + * Declare Rules-Requires-Root: no. + * Migrate to git on salsa.debian.org. + * Simply have the autopkgtests install the build-deps. + * Patch update-unidecode-tests: unidecode changed behaviour. + * Bump debhelper compat to 10. + - Drop dh_compress override, no longer needed. + * Rely on pybuild for tests and clean. + * Get the test suite passing (Closes: #892735). + - Patch no-discogs: discogs is not available in debian. + - Patch pathlib-is-stdlib: We don't have python3-pathlib in Debian. + - Patch: skip-broken-test. + * Drop patch skip-test_query-path-tests, superseded upstream. + + [ Ondřej Nový ] + * d/copyright: Use https protocol in Format field + + -- Stefano Rivera Mon, 12 Mar 2018 15:20:40 -0700 + +beets (1.4.6-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Remove Simon Chopin from the uploaders list. Closes: #889761. * Run the tests during the build using python3. * Run the autopkg tests using python3, update test dependencies. + Closes: #889078. - -- Matthias Klose Mon, 12 Mar 2018 11:31:56 +0100 + -- Matthias Klose Mon, 12 Mar 2018 11:44:22 +0100 beets (1.4.6-1) unstable; urgency=medium @@ -35,6 +60,7 @@ no-jellyfish * Because #806716 has been resolved, added a build-dependency on python3-jellyfish; this justifies dropping the no-jellyfish patch. + (Closes: #839640) * Fixed insecure URLs for Vcs-Browser; no secure alternative exists for Vcs-Svn * Updated copyright holders diff -Nru beets-1.4.6/debian/clean beets-1.4.6/debian/clean --- beets-1.4.6/debian/clean 2011-12-13 12:52:11.000000000 +0000 +++ beets-1.4.6/debian/clean 2018-03-12 22:20:40.000000000 +0000 @@ -1 +1,2 @@ *.egg-info/* +docs/_build/ diff -Nru beets-1.4.6/debian/compat beets-1.4.6/debian/compat --- beets-1.4.6/debian/compat 2016-08-23 08:10:38.000000000 +0000 +++ beets-1.4.6/debian/compat 2018-03-12 22:20:40.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru beets-1.4.6/debian/control beets-1.4.6/debian/control --- beets-1.4.6/debian/control 2018-01-04 20:43:33.000000000 +0000 +++ beets-1.4.6/debian/control 2018-03-12 22:20:40.000000000 +0000 @@ -4,10 +4,9 @@ Maintainer: Python Applications Packaging Team Uploaders: Stefano Rivera , - Simon Chopin , Ryan Kavanagh Build-Depends: - debhelper (>= 9), + debhelper (>= 10), dh-python, libc-bin (>= 2.13), python3-all (>= 3.4), @@ -30,8 +29,9 @@ Standards-Version: 4.1.3 X-Python3-Version: >= 3.4 Homepage: http://beets.radbox.org/ -Vcs-Svn: svn://anonscm.debian.org/python-apps/packages/beets/trunk/ -Vcs-Browser: https://anonscm.debian.org/viewvc/python-apps/packages/beets/trunk/ +Vcs-Git: https://salsa.debian.org/python-team/applications/beets.git +Vcs-Browser: https://salsa.debian.org/python-team/applications/beets +Rules-Requires-Root: no Package: beets Architecture: all diff -Nru beets-1.4.6/debian/copyright beets-1.4.6/debian/copyright --- beets-1.4.6/debian/copyright 2018-01-04 20:43:45.000000000 +0000 +++ beets-1.4.6/debian/copyright 2018-03-12 22:20:40.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Beets Upstream-Contact: Adrian Sampson Source: http://beets.radbox.org/ diff -Nru beets-1.4.6/debian/gbp.conf beets-1.4.6/debian/gbp.conf --- beets-1.4.6/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ beets-1.4.6/debian/gbp.conf 2018-03-12 22:20:40.000000000 +0000 @@ -0,0 +1,2 @@ +[DEFAULT] +debian-branch=debian/master diff -Nru beets-1.4.6/debian/patches/no-discogs beets-1.4.6/debian/patches/no-discogs --- beets-1.4.6/debian/patches/no-discogs 1970-01-01 00:00:00.000000000 +0000 +++ beets-1.4.6/debian/patches/no-discogs 2018-03-12 22:20:40.000000000 +0000 @@ -0,0 +1,50 @@ +From: Stefano Rivera +Date: Mon, 12 Mar 2018 14:01:05 -0700 +Subject: Discogs is not available in debian. + +--- + setup.py | 1 - + test/test_discogs.py | 1 + + test/testall.py | 5 ++++- + 3 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 24c5710..dd89401 100755 +--- a/setup.py ++++ b/setup.py +@@ -106,7 +106,6 @@ setup( + 'pyxdg', + 'pathlib', + 'python-mpd2', +- 'discogs-client' + ], + + # Plugin (optional) dependencies: +diff --git a/test/test_discogs.py b/test/test_discogs.py +index 74f9a56..927ebcd 100644 +--- a/test/test_discogs.py ++++ b/test/test_discogs.py +@@ -22,6 +22,7 @@ from test import _common + from test._common import Bag + from test.helper import capture_log + ++raise unittest.SkipTest("discogs is not available in Debian") + from beetsplug.discogs import DiscogsPlugin + + +diff --git a/test/testall.py b/test/testall.py +index 88eb701..01081eb 100755 +--- a/test/testall.py ++++ b/test/testall.py +@@ -35,7 +35,10 @@ def suite(): + match = re.match(r'(test_\S+)\.py$', fname) + if match: + modname = match.group(1) +- s.addTest(__import__(modname).suite()) ++ try: ++ s.addTest(__import__(modname).suite()) ++ except unittest.SkipTest: ++ continue + return s + + diff -Nru beets-1.4.6/debian/patches/pathlib-is-stdlib beets-1.4.6/debian/patches/pathlib-is-stdlib --- beets-1.4.6/debian/patches/pathlib-is-stdlib 1970-01-01 00:00:00.000000000 +0000 +++ beets-1.4.6/debian/patches/pathlib-is-stdlib 2018-03-12 22:20:40.000000000 +0000 @@ -0,0 +1,21 @@ +From: Stefano Rivera +Date: Mon, 12 Mar 2018 14:15:58 -0700 +Subject: pathlib is stdlib + +We don't have a python3-pathlib package in Debian. +--- + setup.py | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/setup.py b/setup.py +index dd89401..a0c9498 100755 +--- a/setup.py ++++ b/setup.py +@@ -104,7 +104,6 @@ setup( + 'rarfile', + 'responses', + 'pyxdg', +- 'pathlib', + 'python-mpd2', + ], + diff -Nru beets-1.4.6/debian/patches/series beets-1.4.6/debian/patches/series --- beets-1.4.6/debian/patches/series 2017-07-27 20:36:14.000000000 +0000 +++ beets-1.4.6/debian/patches/series 2018-03-12 22:20:40.000000000 +0000 @@ -1 +1,4 @@ -skip-test_query-path-tests +update-unidecode-tests +no-discogs +pathlib-is-stdlib +skip-broken-test diff -Nru beets-1.4.6/debian/patches/skip-broken-test beets-1.4.6/debian/patches/skip-broken-test --- beets-1.4.6/debian/patches/skip-broken-test 1970-01-01 00:00:00.000000000 +0000 +++ beets-1.4.6/debian/patches/skip-broken-test 2018-03-12 22:20:40.000000000 +0000 @@ -0,0 +1,21 @@ +From: Stefano Rivera +Date: Mon, 12 Mar 2018 14:36:58 -0700 +Subject: Skip test_command_line_option_relative_to_working_dir + +Bug-Upstream: https://github.com/beetbox/beets/issues/2400 +--- + test/test_ui.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/test/test_ui.py b/test/test_ui.py +index 77804d3..e8da774 100644 +--- a/test/test_ui.py ++++ b/test/test_ui.py +@@ -907,6 +907,7 @@ class ConfigTest(unittest.TestCase, TestHelper, _common.Assertions): + os.path.join(self.beetsdir, b'state') + ) + ++ @unittest.skip("Broken") + def test_command_line_option_relative_to_working_dir(self): + os.chdir(self.temp_dir) + self.run_command('--library', 'foo.db', 'test', lib=None) diff -Nru beets-1.4.6/debian/patches/skip-test_query-path-tests beets-1.4.6/debian/patches/skip-test_query-path-tests --- beets-1.4.6/debian/patches/skip-test_query-path-tests 2017-07-27 20:36:14.000000000 +0000 +++ beets-1.4.6/debian/patches/skip-test_query-path-tests 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -Description: Skip failing tests caused by SQLITE_LIKE_DOESNT_MATCH_BLOBS - Path matching in beets is broken by SQLITE_LIKE_DOESNT_MATCH_BLOBS. - Let's just skip these tests until upstream has a solution. -Author: Stefano Rivera -Bug-Upstream: https://github.com/beetbox/beets/issues/2172 - -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() - -+ @unittest.skip('unfixed (#2172)') - def test_path_exact_match(self): - q = u'path:/a/b/c.mp3' - results = self.lib.items(q) -@@ -420,6 +421,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, []) - -+ @unittest.skip('unfixed (#2172)') - def test_parent_directory_no_slash(self): - q = u'path:/a' - results = self.lib.items(q) -@@ -428,6 +430,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, [u'path album']) - -+ @unittest.skip('unfixed (#2172)') - def test_parent_directory_with_slash(self): - q = u'path:/a/' - results = self.lib.items(q) -@@ -452,6 +455,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, []) - -+ @unittest.skip('unfixed (#2172)') - def test_nonnorm_path(self): - q = u'path:/x/../a/b' - results = self.lib.items(q) -@@ -460,6 +464,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, [u'path album']) - -+ @unittest.skip('unfixed (#2172)') - def test_slashed_query_matches_path(self): - q = u'/a/b' - results = self.lib.items(q) -@@ -497,6 +502,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, [u'path album']) - -+ @unittest.skip('unfixed (#2172)') - def test_escape_underscore(self): - self.add_album(path=b'/a/_/title.mp3', title=u'with underscore', - album=u'album with underscore') -@@ -507,6 +513,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, [u'album with underscore']) - -+ @unittest.skip('unfixed (#2172)') - def test_escape_percent(self): - self.add_album(path=b'/a/%/title.mp3', title=u'with percent', - album=u'album with percent') -@@ -517,6 +524,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, [u'album with percent']) - -+ @unittest.skip('unfixed (#2172)') - def test_escape_backslash(self): - self.add_album(path=br'/a/\x/title.mp3', title=u'with backslash', - album=u'album with backslash') -@@ -527,6 +535,7 @@ - results = self.lib.albums(q) - self.assert_albums_matched(results, [u'album with backslash']) - -+ @unittest.skip('unfixed (#2172)') - def test_case_sensitivity(self): - self.add_album(path=b'/A/B/C2.mp3', title=u'caps path') - diff -Nru beets-1.4.6/debian/patches/update-unidecode-tests beets-1.4.6/debian/patches/update-unidecode-tests --- beets-1.4.6/debian/patches/update-unidecode-tests 1970-01-01 00:00:00.000000000 +0000 +++ beets-1.4.6/debian/patches/update-unidecode-tests 2018-03-12 22:20:40.000000000 +0000 @@ -0,0 +1,34 @@ +From: Adrian Sampson +Date: Tue, 30 Jan 2018 20:50:43 -0500 +Subject: Update tests for new Unidecode behavior: fix #2799 + +The library has started putting spaces around the expanded versions of +vulgar fraction characters. + +Origin: upstream, https://github.com/beetbox/beets/commit/9577a511cb055f143deb2ad8f2b801595b5f5c3f +--- + test/test_library.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test/test_library.py b/test/test_library.py +index aaab6fe..ea56696 100644 +--- a/test/test_library.py ++++ b/test/test_library.py +@@ -427,7 +427,7 @@ class DestinationTest(_common.TestCase): + self.lib.directory = b'lib' + self.lib.path_formats = [(u'default', u'$title')] + self.i.title = u'ab\xa2\xbdd' +- self.assertEqual(self.i.destination(), np('lib/abC_1_2d')) ++ self.assertEqual(self.i.destination(), np('lib/abC_ 1_2 d')) + + def test_destination_with_replacements(self): + self.lib.directory = b'base' +@@ -591,7 +591,7 @@ class DestinationFunctionTest(_common.TestCase, PathFormattingMixin): + + def test_asciify_variable(self): + self._setf(u'%asciify{ab\xa2\xbdd}') +- self._assert_dest(b'/base/abC_1_2d') ++ self._assert_dest(b'/base/abC_ 1_2 d') + + def test_left_variable(self): + self._setf(u'%left{$title, 3}') diff -Nru beets-1.4.6/debian/rules beets-1.4.6/debian/rules --- beets-1.4.6/debian/rules 2018-03-12 10:31:56.000000000 +0000 +++ beets-1.4.6/debian/rules 2018-03-12 22:20:40.000000000 +0000 @@ -1,33 +1,14 @@ #!/usr/bin/make -f export PYBUILD_INSTALL_ARGS=--install-lib=/usr/share/beets/ --install-scripts=/usr/share/beets/ +export LC_ALL=C.UTF-8 %: dh $@ --with python3,sphinxdoc --buildsystem=pybuild override_dh_auto_build: dh_auto_build - PYTHONPATH=$(CURDIR) $(MAKE) -C docs html man BUILDDIR=$(CURDIR)/build/docs - -override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) - # Tests (non-destructively) open the database - mkdir -p build/home - set -e -x; \ - for python in $(shell py3versions -r); do \ - HOME=$(CURDIR)/build/home \ - LC_ALL=C.UTF-8 \ - $$python setup.py test; \ - done -endif - -override_dh_auto_clean: - dh_auto_clean - rm -rf build - rm -rf beets.egg-info + PYTHONPATH=$(CURDIR) $(MAKE) -C docs html man override_dh_installchangelogs: dh_installchangelogs docs/changelog.rst - -override_dh_compress: - dh_compress -X.html -X.txt -X.inv diff -Nru beets-1.4.6/debian/tests/control beets-1.4.6/debian/tests/control --- beets-1.4.6/debian/tests/control 2018-03-12 10:31:11.000000000 +0000 +++ beets-1.4.6/debian/tests/control 2018-03-12 22:20:40.000000000 +0000 @@ -1,13 +1,4 @@ Tests: unittests Depends: beets, - python3-all, - python3-bs4, - python3-flask, - python3-mock, - python3-mpd, - python3-pathlib, - python3-pylast, - python3-rarfile, - python3-responses, - python3-xdg + @builddeps@