[Python-apps-commits] r10172 - in packages/beets/trunk/debian (5 files)

[laarmen-guest at users.alioth.debian.org]

    Date: Sunday, November 24, 2013 @ 15:05:22
  Author: laarmen-guest
Revision: 10172

* New upstream release (Closes: #730046)
  + Bump the dependency on python-mutagen (>= 1.22)
  + Drop the fix_bpd_search patch, merged upstream.
* Export PYTHONPATH when building the doc to build the API docs as well.

Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/control
  packages/beets/trunk/debian/patches/series
  packages/beets/trunk/debian/rules
Deleted:
  packages/beets/trunk/debian/patches/fix-bpd-search

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2013-11-24 01:35:12 UTC (rev 10171)
+++ packages/beets/trunk/debian/changelog	2013-11-24 15:05:22 UTC (rev 10172)
@@ -1,8 +1,12 @@
-beets (1.2.1-2) UNRELEASED; urgency=low
+beets (1.3.1-1) UNRELEASED; urgency=low
 
   * Version the dependency on python-musicbrainzngs (>= 0.4) (Closes: #717763)
+  * New upstream release (Closes: #730046)
+    + Bump the dependency on python-mutagen (>= 1.22)
+    + Drop the fix_bpd_search patch, merged upstream.
+  * Export PYTHONPATH when building the doc to build the API docs as well.
 
- -- Simon Chopin <chopin.simon at gmail.com>  Fri, 26 Jul 2013 23:16:04 +0200
+ -- Simon Chopin <chopin.simon at gmail.com>  Fri, 22 Nov 2013 18:06:45 +0100
 
 beets (1.2.1-1) unstable; urgency=low
 

Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control	2013-11-24 01:35:12 UTC (rev 10171)
+++ packages/beets/trunk/debian/control	2013-11-24 15:05:22 UTC (rev 10172)
@@ -12,7 +12,7 @@
  python-docutils,
  python-munkres,
  python-musicbrainzngs (>= 0.4),
- python-mutagen (>= 1.21),
+ python-mutagen (>= 1.22),
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
  python-unidecode,

Deleted: packages/beets/trunk/debian/patches/fix-bpd-search
===================================================================
--- packages/beets/trunk/debian/patches/fix-bpd-search	2013-11-24 01:35:12 UTC (rev 10171)
+++ packages/beets/trunk/debian/patches/fix-bpd-search	2013-11-24 15:05:22 UTC (rev 10172)
@@ -1,40 +0,0 @@
-From: Simon Chopin <chopin.simon at gmail.com>
-Date: Tue, 2 Jul 2013 11:00:10 +0200
-Description: bpd: Use AnyFieldQuery when searching "any" fields
- BPD hadn't been ported when AnySubstringQuery was removed, resulting in
- crash, death and horror when using the search function.
-Forwarded: https://github.com/sampsyo/beets/pull/340
-
-diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
-index bebcf1b..6d79405 100644
---- a/beetsplug/bpd/__init__.py
-+++ b/beetsplug/bpd/__init__.py
-@@ -31,6 +31,7 @@ import beets.ui
- from beets import vfs
- from beets import config
- from beets.util import bluelet
-+from beets.library import ITEM_KEYS_WRITABLE
- 
- PROTOCOL_VERSION = '0.13.0'
- BUFSIZE = 1024
-@@ -997,7 +998,7 @@ class Server(BaseServer):
-             for tag, value in zip(it, it):
-                 if tag.lower() == u'any':
-                     if any_query_type:
--                        queries.append(any_query_type(value))
-+                        queries.append(any_query_type(value, ITEM_KEYS_WRITABLE, query_type))
-                     else:
-                         raise BPDError(ERROR_UNKNOWN, u'no such tagtype')
-                 else:
-@@ -1010,7 +1011,7 @@ class Server(BaseServer):
-     def cmd_search(self, conn, *kv):
-         """Perform a substring match for items."""
-         query = self._metadata_query(beets.library.SubstringQuery,
--                                     beets.library.AnySubstringQuery,
-+                                     beets.library.AnyFieldQuery,
-                                      kv)
-         for item in self.lib.items(query):
-             yield self._item_info(item)
--- 
-1.8.3.1
-

Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series	2013-11-24 01:35:12 UTC (rev 10171)
+++ packages/beets/trunk/debian/patches/series	2013-11-24 15:05:22 UTC (rev 10172)
@@ -1,2 +1 @@
 no-namespace-pkg
-fix-bpd-search

Modified: packages/beets/trunk/debian/rules
===================================================================
--- packages/beets/trunk/debian/rules	2013-11-24 01:35:12 UTC (rev 10171)
+++ packages/beets/trunk/debian/rules	2013-11-24 15:05:22 UTC (rev 10172)
@@ -5,7 +5,7 @@
 
 override_dh_auto_build:
 	dh_auto_build
-	$(MAKE) -C docs html man BUILDDIR=$(CURDIR)/build/docs
+	PYTHONPATH=$(CURDIR) $(MAKE) -C docs html man BUILDDIR=$(CURDIR)/build/docs
 
 override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))