[Python-apps-commits] r13545 - in packages/beets/trunk/debian (14 files)

stefanor at users.alioth.debian.org stefanor at users.alioth.debian.org
Tue Aug 23 08:10:40 UTC 2016


    Date: Tuesday, August 23, 2016 @ 08:10:38
  Author: stefanor
Revision: 13545

* New upstream release. (Closes: #775719, #792060, LP: #1502394)
  - No need to repack any more.
  - Drop patches, superseded upstream.
  - Update copyright.
  - Add Build-Depends: python-{bs4,mpd,mutagen,pathlib,rarfile,xdg}
  - Add Suggests (plugin dependencies):
    python-{dbus,pathlib,rarfile,requests-oauthlib,xdg}
  - Update gstreamer Suggests to python-gst-1.0 (Closes: #785903)
  - Upstream dropped Python 2.6 support.
* Drop Build-Conflicts: python-rarfile, it seems to be working now.
* Patches:
  - Bundled a function from jellyfish, pending resolving a package namespace
    problem blocking packaging jellyfish. See #806716.
  - Cherry pick upstream fixes for test_mediafile_edge and test_hidden.
  - Skip tests for path queries, as these are broken by Debian sqlite using
    SQLITE_LIKE_DOESNT_MATCH_BLOBS.
* Switch watch file to pypi.debian.net. (Closes: #815761)
* Bump debhelper compat level to 9.
* Bump Standards-Version to 3.9.8, no changes needed.

Added:
  packages/beets/trunk/debian/patches/fix-test_hidden
  packages/beets/trunk/debian/patches/fix-test_mediafile_edge
  packages/beets/trunk/debian/patches/no-jellyfish
  packages/beets/trunk/debian/patches/skip-test_query-path-tests
Modified:
  packages/beets/trunk/debian/beets-doc.links
  packages/beets/trunk/debian/beets.links
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/compat
  packages/beets/trunk/debian/control
  packages/beets/trunk/debian/copyright
  packages/beets/trunk/debian/patches/series
  packages/beets/trunk/debian/watch
Deleted:
  packages/beets/trunk/debian/patches/disable-broken-tests
  packages/beets/trunk/debian/patches/test_bucket-years

Modified: packages/beets/trunk/debian/beets-doc.links
===================================================================
--- packages/beets/trunk/debian/beets-doc.links	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/beets-doc.links	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,3 +1,3 @@
+/usr/share/doc/beets-doc/html                        /usr/share/doc/beets/html
 /usr/share/doc/beets-doc/html/_sources               /usr/share/doc/beets-doc/rst
-/usr/share/doc/beets-doc/html                        /usr/share/doc/beets/html
 /usr/share/doc/beets-doc/rst                         /usr/share/doc/beets/rst

Modified: packages/beets/trunk/debian/beets.links
===================================================================
--- packages/beets/trunk/debian/beets.links	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/beets.links	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,3 +1,3 @@
+/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/javascript/backbone/backbone.js       /usr/share/beets/beetsplug/web/static/backbone.js

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/changelog	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,7 +1,24 @@
-beets (1.3.8+dfsg-3) UNRELEASED; urgency=medium
+beets (1.3.19-1) UNRELEASED; urgency=medium
 
-  * Switch watch file to use dversionmangle and repacksuffix, now that it
-    exists.
+  * New upstream release. (Closes: #775719, #792060, LP: #1502394)
+    - No need to repack any more.
+    - Drop patches, superseded upstream.
+    - Update copyright.
+    - Add Build-Depends: python-{bs4,mpd,mutagen,pathlib,rarfile,xdg}
+    - Add Suggests (plugin dependencies):
+      python-{dbus,pathlib,rarfile,requests-oauthlib,xdg}
+    - Update gstreamer Suggests to python-gst-1.0 (Closes: #785903)
+    - Upstream dropped Python 2.6 support.
+  * Drop Build-Conflicts: python-rarfile, it seems to be working now.
+  * Patches:
+    - Bundled a function from jellyfish, pending resolving a package namespace
+      problem blocking packaging jellyfish. See #806716.
+    - Cherry pick upstream fixes for test_mediafile_edge and test_hidden.
+    - Skip tests for path queries, as these are broken by Debian sqlite using
+      SQLITE_LIKE_DOESNT_MATCH_BLOBS.
+  * Switch watch file to pypi.debian.net. (Closes: #815761)
+  * Bump debhelper compat level to 9.
+  * Bump Standards-Version to 3.9.8, no changes needed.
 
  -- Stefano Rivera <stefanor at debian.org>  Sun, 18 Jan 2015 11:42:47 -0800
 

Modified: packages/beets/trunk/debian/compat
===================================================================
--- packages/beets/trunk/debian/compat	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/compat	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1 +1 @@
-7
+9

Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/control	2016-08-23 08:10:38 UTC (rev 13545)
@@ -6,31 +6,35 @@
  Stefano Rivera <stefanor at debian.org>,
  Simon Chopin <chopin.simon at gmail.com>
 Build-Depends:
- debhelper (>= 8.1),
+ debhelper (>= 9),
+ dh-python,
  libc-bin (>= 2.13),
  python-all (>= 2.6.6-3~),
+ python-bs4,
  python-docutils,
- python-enum34,
+ python-enum34 (>= 1.0.4),
  python-flask,
  python-mock,
+ python-mpd,
  python-munkres,
  python-musicbrainzngs (>= 0.4),
- python-mutagen (>= 1.22),
+ python-mutagen (>= 1.27),
  python-nose,
+ python-pathlib,
  python-pylast,
+ python-rarfile,
  python-responses,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python-unidecode,
  python-unittest2,
+ python-xdg,
  python-yaml
-Build-Conflicts: python-rarfile
-X-Python-Version: >= 2.5
-Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+Standards-Version: 3.9.8
 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/
-XS-Testsuite: autopkgtest
 
 Package: beets
 Architecture: all
@@ -46,18 +50,21 @@
  ${python:Depends}
 Suggests:
  beets-doc,
- gir1.2-gstreamer-1.0,
  libav-tools,
  mp3gain,
  python-acoustid,
  python-bs4,
+ python-dbus,
  python-flask,
- python-gi,
- python-gst0.10,
+ python-gst-1.0,
  python-imaging,
  python-mpd,
+ python-pathlib,
  python-pylast,
- python-requests
+ python-rarfile,
+ python-requests,
+ python-requests-oauthlib,
+ python-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	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/copyright	2016-08-23 08:10:38 UTC (rev 13545)
@@ -2,35 +2,39 @@
 Upstream-Name: Beets
 Upstream-Contact: Adrian Sampson <adrian at radbox.org>
 Source: http://beets.radbox.org/
-Files-Excluded:
- test/rsrc/lyrics
-Comment:
- The upstream includes verbatim HTML from lyrics websites, with no clear
- license to redistribute this. A few of these pages claim All Rights Reserved.
 
 Files: *
-Copyright: 2010-2014, Adrian Sampson <adrian at radbox.org>
-           2012-2014, Fabrice Laporte
-           2013-2014, Thomas Scholtes
+Copyright: 2010-2016, Adrian Sampson <adrian at radbox.org>
+           2012-2016, Fabrice Laporte
+           2013-2016, Thomas Scholtes
 License: Expat
 
 Files: beetsplug/*
-Copyright: 2010-2014, Adrian Sampson <adrian at radbox.org>
-           2014,      aroquen
-           2012-2014, Blemjhoo Tezoulbr <baobab at heresiarch.info>
-           2014,      Dang Mai <contact at dangmai.net>
-           2012-2013, David Brenner
-           2014,      David Hamp-Gonsalves
-           2012-2014, Fabrice Laporte
-           2012-2014, Jakob Schnitzer
-           2013,      Jan-Erik Dahlin
-           2013,      Johann Klähn
-           2013,      Pedro Silva
-           2013,      Peter Schnebel
-           2011-2013, Philippe Mongeau
-           2014,      Thomas Scholtes
-           2013,      Verrus
-           2014,      Yevgeny Bezman
+       test/*
+Copyright: 2010-2016, Adrian Sampson <adrian at radbox.org>
+           2014-2016, aroquen
+           2012-2016, Blemjhoo Tezoulbr <baobab at heresiarch.info>
+           2016,      Bruno Cauet
+           2013-2016, Dang Mai <contact at dangmai.net>
+           2014-2016, David Hamp-Gonsalves
+           2016,      Diego Moreda
+           2012-2016, Fabrice Laporte
+           2016,      François-Xavier Thomas
+           2016,      Heinz Wiesinger
+           2012-2016, Jakob Schnitzer
+           2013-2016, Jan-Erik Dahlin
+           2013-2016, Johann Klähn
+           2016,      Malte Ried
+           2016,      Matt Lichtenberg
+           2015-2016, Ohm Patel
+           2013-2016, Pedro Silva
+           2013-2016, Peter Schnebel
+           2011-2016, Philippe Mongeau
+           2016,      Rafael Bodill <http://github.com/rafi>
+           2014-2016, Thomas Scholtes
+           2016,      Tom Jaspers
+           2013-2016, Verrus <github.com/Verrus/beets-plugin-featInTitle>
+           2014-2016, Yevgeny Bezman
 License: Expat
 
 Files: beetsplug/mbcollection.py
@@ -43,17 +47,15 @@
 License: Expat
 
 Files: beetsplug/web/static/jquery.js
-Copyright: 2011-2013, John Resig,
-           2011-2013, The Dojo Foundation
+Copyright: 2011-2016, John Resig,
+           2011-2016, The Dojo Foundation
 License: Expat or GPL-2
+Comment:
  You may use any jQuery project under the terms of either the MIT License or
  the GNU General Public License (GPL) Version 2
- .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'
 
 Files: debian/*
-Copyright: 2010-2014, Stefano Rivera <stefanor at debian.org>
+Copyright: 2010-2016, Stefano Rivera <stefanor at debian.org>
            2012-2014, Simon Chopin <chopin.simon at gmail.com>
 License: Expat
 
@@ -88,3 +90,7 @@
  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  PERFORMANCE OF THIS SOFTWARE.
+
+License: GPL-2
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'

Deleted: packages/beets/trunk/debian/patches/disable-broken-tests
===================================================================
--- packages/beets/trunk/debian/patches/disable-broken-tests	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/patches/disable-broken-tests	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,19 +0,0 @@
-Description: Disable the pyechonest dependency for the tests
- This will in turn disable the tests themselves.
-Author: Simon Chopin <chopin.simon at gmail.com>
-Forwarded: not-needed
-Last-Update: 2014-10-21
-
---- a/setup.py
-+++ b/setup.py
-@@ -86,10 +86,8 @@
- 
-     tests_require=[
-         'responses',
--        'pyechonest',
-         'mock',
-         'flask',
--        'rarfile',
-         'pylast',
-     ],
- 

Added: packages/beets/trunk/debian/patches/fix-test_hidden
===================================================================
--- packages/beets/trunk/debian/patches/fix-test_hidden	                        (rev 0)
+++ packages/beets/trunk/debian/patches/fix-test_hidden	2016-08-23 08:10:38 UTC (rev 13545)
@@ -0,0 +1,17 @@
+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')

Added: packages/beets/trunk/debian/patches/fix-test_mediafile_edge
===================================================================
--- packages/beets/trunk/debian/patches/fix-test_mediafile_edge	                        (rev 0)
+++ packages/beets/trunk/debian/patches/fix-test_mediafile_edge	2016-08-23 08:10:38 UTC (rev 13545)
@@ -0,0 +1,15 @@
+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)

Added: packages/beets/trunk/debian/patches/no-jellyfish
===================================================================
--- packages/beets/trunk/debian/patches/no-jellyfish	                        (rev 0)
+++ packages/beets/trunk/debian/patches/no-jellyfish	2016-08-23 08:10:38 UTC (rev 13545)
@@ -0,0 +1,86 @@
+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	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/patches/series	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,2 +1,4 @@
-disable-broken-tests
-test_bucket-years
+fix-test_hidden
+no-jellyfish
+fix-test_mediafile_edge
+skip-test_query-path-tests

Added: packages/beets/trunk/debian/patches/skip-test_query-path-tests
===================================================================
--- packages/beets/trunk/debian/patches/skip-test_query-path-tests	                        (rev 0)
+++ packages/beets/trunk/debian/patches/skip-test_query-path-tests	2016-08-23 08:10:38 UTC (rev 13545)
@@ -0,0 +1,80 @@
+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 <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 @@
+         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)
+@@ -419,6 +420,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)
+@@ -427,6 +429,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)
+@@ -451,6 +454,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)
+@@ -459,6 +463,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)
+@@ -496,6 +501,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')
+@@ -506,6 +512,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')
+@@ -516,6 +523,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')
+@@ -526,6 +534,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')
+ 

Deleted: packages/beets/trunk/debian/patches/test_bucket-years
===================================================================
--- packages/beets/trunk/debian/patches/test_bucket-years	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/patches/test_bucket-years	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,19 +0,0 @@
-Description: test_bucket: update test_year_single_year
- 2015 was used as an example of date outside of [1970-current year] intervall
- which is not true anymore
-Author: Fabrice Laporte <kraymer at gmail.com>
-Origin: upstream, https://github.com/sampsyo/beets/commit/80038e2a3fe6f5ac174a30f6fd01ebf8dd63e414
-Bug-Debian: https://bugs.debian.org/775618
-Last-Updated: 2015-01-17
-
---- a/test/test_bucket.py
-+++ b/test/test_bucket.py
-@@ -51,7 +51,7 @@
-         year."""
-         self._setup_config(bucket_year=['1950', '1970'])
-         self.assertEqual(self.plugin._tmpl_bucket('2014'), '1970')
--        self.assertEqual(self.plugin._tmpl_bucket('2015'), '2015')
-+        self.assertEqual(self.plugin._tmpl_bucket('2025'), '2025')
- 
-     def test_year_two_years(self):
-         """Buckets can be named with the 'from-to' syntax."""

Modified: packages/beets/trunk/debian/watch
===================================================================
--- packages/beets/trunk/debian/watch	2016-08-22 17:29:05 UTC (rev 13544)
+++ packages/beets/trunk/debian/watch	2016-08-23 08:10:38 UTC (rev 13545)
@@ -1,4 +1,4 @@
 version=3
 
-opts=uversionmangle=s/(b|rc)/~$1/,dversionmangle=s/\+dfsg$//,repacksuffix=+dfsg \
-https://pypi.python.org/packages/source/b/beets/beets-(.+).tar.gz
+opts=uversionmangle=s/(rc|a|b|c)/~$1/ \
+https://pypi.debian.net/beets/beets-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))




More information about the Python-apps-commits mailing list