[Python-apps-commits] r8089 - in packages/beets/trunk/debian (6 files)

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

    Date: Wednesday, January 18, 2012 @ 15:30:27
  Author: laarmen-guest
Revision: 8089

New upstream release 1.0~b12

Modified:
  packages/beets/trunk/debian/changelog
  packages/beets/trunk/debian/control
  packages/beets/trunk/debian/patches/series
  packages/beets/trunk/debian/patches/unittest2
  packages/beets/trunk/debian/rules
Deleted:
  packages/beets/trunk/debian/patches/libmpd-incompatibility

Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog	2012-01-18 02:31:41 UTC (rev 8088)
+++ packages/beets/trunk/debian/changelog	2012-01-18 15:30:27 UTC (rev 8089)
@@ -1,3 +1,16 @@
+beets (1.0~b12-1) UNRELEASED; urgency=low
+
+  * New upstream release:
+    - Patch libmpd-incompatibility included upstream.
+  * Add myself to Uploaders:
+  * Add python-musicbrainzngs in Build-Depends: since upstream dropped the embedded
+    copy
+  * Suggest the python-acoustid package for the chroma plugin
+  * Remove the egg-info directory in the clean target of debian/rules to
+    enable consecutive builds.
+
+ -- Simon Chopin <chopin.simon at gmail.com>  Wed, 18 Jan 2012 02:28:23 +0100
+
 beets (1.0~b11-2) UNRELEASED; urgency=low
 
   * Patch: libmpd-incompatibility: Allow browsing via libmpc based clients.

Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control	2012-01-18 02:31:41 UTC (rev 8088)
+++ packages/beets/trunk/debian/control	2012-01-18 15:30:27 UTC (rev 8089)
@@ -2,13 +2,16 @@
 Section: sound
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Stefano Rivera <stefanor at debian.org>
+Uploaders:
+ Stefano Rivera <stefanor at debian.org>,
+ Simon Chopin <chopin.simon at gmail.com>
 Build-Depends:
  debhelper (>= 7.0.50~),
  locales,
  python-all (>= 2.6.6-3~),
  python-docutils,
  python-munkres,
+ python-musicbrainzngs,
  python-mutagen,
  python-setuptools,
  python-sphinx (>= 1.0.7+dfsg),
@@ -30,7 +33,7 @@
  ${misc:Depends},
  ${python:Depends},
  ${sphinxdoc:Depends}
-Suggests: python-flask, python-gst0.10, python-rgain
+Suggests: python-acoustid, python-flask, python-gst0.10, python-rgain
 Description: music tagger and library organizer
  Beets is a media library management system for obsessive-compulsive music
  geeks.

Deleted: packages/beets/trunk/debian/patches/libmpd-incompatibility
===================================================================
--- packages/beets/trunk/debian/patches/libmpd-incompatibility	2012-01-18 02:31:41 UTC (rev 8088)
+++ packages/beets/trunk/debian/patches/libmpd-incompatibility	2012-01-18 15:30:27 UTC (rev 8089)
@@ -1,21 +0,0 @@
-Description: fix BPD lsinfo results for libmpc
-Author: Adrian Sampson <adrian at radbox.org>
-Origin: upstream, http://code.google.com/p/beets/source/detail?r=a7445071ce5dd7f6ad77c7a90848f3ede489a694
-Bug-Upstream: http://code.google.com/p/beets/issues/detail?id=277
-Last-Update: 2011-12-17
-
---- a/beetsplug/bpd/__init__.py
-+++ b/beetsplug/bpd/__init__.py
-@@ -797,7 +797,11 @@
-                 item = self.lib.get_item(itemid)
-                 yield self._item_info(item)
-             for name, _ in node.dirs.iteritems():
--                yield u'directory: ' + self._path_join(path, name)
-+                dirpath = self._path_join(path, name)
-+                if dirpath.startswith(u"/"):
-+                    # Strip leading slash (libmpc rejects this).
-+                    dirpath = dirpath[1:]
-+                yield u'directory: %s' % dirpath
-         
-     def _listall(self, basepath, node, info=False):
-         """Helper function for recursive listing. If info, show

Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series	2012-01-18 02:31:41 UTC (rev 8088)
+++ packages/beets/trunk/debian/patches/series	2012-01-18 15:30:27 UTC (rev 8089)
@@ -1,3 +1,2 @@
-libmpd-incompatibility
 unittest2
 private-module

Modified: packages/beets/trunk/debian/patches/unittest2
===================================================================
--- packages/beets/trunk/debian/patches/unittest2	2012-01-18 02:31:41 UTC (rev 8088)
+++ packages/beets/trunk/debian/patches/unittest2	2012-01-18 15:30:27 UTC (rev 8089)
@@ -25,17 +25,6 @@
  import os
  import shutil
  import re
---- a/test/test_db.py
-+++ b/test/test_db.py
-@@ -15,7 +15,7 @@
- """Tests for non-query database functions of Item.
- """
- 
--import unittest
-+import unittest2 as unittest
- import os
- import sqlite3
- import ntpath
 --- a/test/test_files.py
 +++ b/test/test_files.py
 @@ -15,7 +15,7 @@
@@ -157,3 +146,25 @@
  import os
  import re
  import sys
+--- a/test/test_db.py
++++ b/test/test_db.py
+@@ -14,7 +14,7 @@
+ 
+ """Tests for non-query database functions of Item.
+ """
+-import unittest
++import unittest2 as unittest
+ import os
+ import sqlite3
+ import ntpath
+--- a/test/test_template.py
++++ b/test/test_template.py
+@@ -14,7 +14,7 @@
+ 
+ """Tests for template engine.
+ """
+-import unittest
++import unittest2 as unittest
+ 
+ import _common
+ from beets.util import functemplate

Modified: packages/beets/trunk/debian/rules
===================================================================
--- packages/beets/trunk/debian/rules	2012-01-18 02:31:41 UTC (rev 8088)
+++ packages/beets/trunk/debian/rules	2012-01-18 15:30:27 UTC (rev 8089)
@@ -28,6 +28,7 @@
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
+	rm -rf beets.egg-info
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/changelog.rst