[Python-apps-commits] r7944 - in packages/beets/trunk/debian (14 files)
stefanor at users.alioth.debian.org
stefanor at users.alioth.debian.org
Tue Dec 13 12:52:13 UTC 2011
Date: Tuesday, December 13, 2011 @ 12:52:11
Author: stefanor
Revision: 7944
* New upstream release (Closes: #650078)
- No need to repack any more, upstream uses non-minified JS.
* Drop dependency on python-musicbrainz2 (now uses the internal musicbrainz3
library, soon to be broken out into musicbrainz-ngs).
* Build docs, they are now included.
- Use upstream's manpages.
* Run tests, they are now included.
- Use unittest2 to provide newer unittest features for python2.6.
* Suggest python-rgain, for the rgain plugin.
Added:
packages/beets/trunk/debian/manpages
packages/beets/trunk/debian/patches/unittest2
Modified:
packages/beets/trunk/debian/changelog
packages/beets/trunk/debian/clean
packages/beets/trunk/debian/control
packages/beets/trunk/debian/copyright
packages/beets/trunk/debian/docs
packages/beets/trunk/debian/links
packages/beets/trunk/debian/patches/private-module
packages/beets/trunk/debian/patches/series
packages/beets/trunk/debian/rules
packages/beets/trunk/debian/watch
Deleted:
packages/beets/trunk/debian/beet.rst
packages/beets/trunk/debian/repack.sh
Deleted: packages/beets/trunk/debian/beet.rst
===================================================================
--- packages/beets/trunk/debian/beet.rst 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/beet.rst 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,75 +0,0 @@
-======
- beet
-======
-
-----------------------------------------------
-music tagger and library organizer
-----------------------------------------------
-
-:Date: 2011-11-21
-:Version: 1.0b10
-:Manual section: 1
-:Manual group: beets
-
-SYNOPSIS
-========
-
-| **beet** *command* [*args*...]
-| **beet help** *command*
-
-DESCRIPTION
-===========
-
-Beets is a media library management system for obsessive-compulsive
-music geeks.
-
-The purpose of beets is to get your music collection right once and for
-all.
-It catalogs your collection, automatically improving its metadata as it
-goes using the MusicBrainz database.
-It then provides a set of tools for manipulating and accessing your
-music.
-
-COMMAND OVERVIEW
-================
-
-beet import
- Add music to your library, attempting to get correct tags for it
- from MusicBrainz.
-beet list
- Query the database for music.
-beet modify
- Change the metadata for items or albums in the database.
-beet move
- Move or copy items in your library.
-beet update
- Update the library (and, optionally, move files) to reflect
- out-of-band metadata changes and file deletions.
-beet stats
- Show some statistics on your entire library (if you don't provide a
- query or the matched items (if you do).
-beet bpd
- (**bpd** plugin) Run an MPD-compatible music player server.
-embedart
- (**embedart** plugin) Given an image file and a query matching an
- album, embed the image into the metadata of every track on the
- album.
-extractart
- (**embedart** plugin) Extracts the image from an item matching the
- query and stores it in a file.
-clearart
- (**embedart** plugin) Removes all embedded images from all items
- matching the query.
-web
- (**web** plugin) Start a Web interface.
-
-COMMAND REFERENCE
-=================
-
-For details on the option for each command, run **beet help** *command*,
-or see the reference documentation.
-
-SEE ALSO
-========
-
-``http://beets.readthedocs.org/``
Modified: packages/beets/trunk/debian/changelog
===================================================================
--- packages/beets/trunk/debian/changelog 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/changelog 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,3 +1,17 @@
+beets (1.0~b11-1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #650078)
+ - No need to repack any more, upstream uses non-minified JS.
+ * Drop dependency on python-musicbrainz2 (now uses the internal musicbrainz3
+ library, soon to be broken out into musicbrainz-ngs).
+ * Build docs, they are now included.
+ - Use upstream's manpages.
+ * Run tests, they are now included.
+ - Use unittest2 to provide newer unittest features for python2.6.
+ * Suggest python-rgain, for the rgain plugin.
+
+ -- Stefano Rivera <stefanor at debian.org> Tue, 13 Dec 2011 12:03:09 +0200
+
beets (1.0~b10+dfsg-2) unstable; urgency=low
* Depend on python-pkg-resources (Closes: #649927)
Modified: packages/beets/trunk/debian/clean
===================================================================
--- packages/beets/trunk/debian/clean 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/clean 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,2 +1 @@
*.egg-info/*
-debian/beet.1
Modified: packages/beets/trunk/debian/control
===================================================================
--- packages/beets/trunk/debian/control 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/control 2011-12-13 12:52:11 UTC (rev 7944)
@@ -7,8 +7,9 @@
debhelper (>= 7.0.50~),
python-all (>= 2.6.6-3~),
python-docutils,
- python-musicbrainz2,
- python-setuptools
+ python-setuptools,
+ python-sphinx (>= 1.0.7+dfsg),
+ python-unittest2
X-Python-Version: >= 2.5
Standards-Version: 3.9.2
Homepage: http://beets.radbox.org/
@@ -21,11 +22,11 @@
libjs-backbone,
libjs-jquery,
libjs-underscore,
- python-musicbrainz2 (>= 0.7.2),
python-pkg-resources,
${misc:Depends},
- ${python:Depends}
-Suggests: python-flask, python-gst0.10
+ ${python:Depends},
+ ${sphinxdoc:Depends}
+Suggests: 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.
Modified: packages/beets/trunk/debian/copyright
===================================================================
--- packages/beets/trunk/debian/copyright 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/copyright 2011-12-13 12:52:11 UTC (rev 7944)
@@ -2,8 +2,6 @@
Upstream-Name: Beets
Upstream-Contact: Adrian Sampson <adrian at radbox.org>
Source: http://beets.radbox.org/
-Comment: Upstream source repacked to remove minified javascript with
- un-minified versions.
Files: *
Copyright: 2010-2011, Adrian Sampson <adrian at radbox.org>
Modified: packages/beets/trunk/debian/docs
===================================================================
--- packages/beets/trunk/debian/docs 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/docs 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,2 +1,2 @@
-NEWS
README.rst
+build/docs/html
Modified: packages/beets/trunk/debian/links
===================================================================
--- packages/beets/trunk/debian/links 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/links 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,3 +1,4 @@
-/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
+/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
+/usr/share/doc/beets/html/_sources /usr/share/doc/beets/rst
Added: packages/beets/trunk/debian/manpages
===================================================================
--- packages/beets/trunk/debian/manpages (rev 0)
+++ packages/beets/trunk/debian/manpages 2011-12-13 12:52:11 UTC (rev 7944)
@@ -0,0 +1 @@
+build/docs/man/*
Modified: packages/beets/trunk/debian/patches/private-module
===================================================================
--- packages/beets/trunk/debian/patches/private-module 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/patches/private-module 2011-12-13 12:52:11 UTC (rev 7944)
@@ -4,9 +4,9 @@
Last-Update: 2011-11-21
--- a/setup.py
+++ b/setup.py
-@@ -42,7 +42,6 @@
- 'beetsplug.bpd',
+@@ -64,7 +64,6 @@
'beetsplug.web',
+ 'beetsplug.lastgenre',
],
- namespace_packages=['beetsplug'],
entry_points={
Modified: packages/beets/trunk/debian/patches/series
===================================================================
--- packages/beets/trunk/debian/patches/series 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/patches/series 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1 +1,2 @@
private-module
+unittest2
Added: packages/beets/trunk/debian/patches/unittest2
===================================================================
--- packages/beets/trunk/debian/patches/unittest2 (rev 0)
+++ packages/beets/trunk/debian/patches/unittest2 2011-12-13 12:52:11 UTC (rev 7944)
@@ -0,0 +1,159 @@
+Description: Use unittest2 to get new Python 2.7 unittest features on 2.6
+Author: Stefano Rivera <stefanor at debian.org>
+Bug-Upstream: http://code.google.com/p/beets/issues/detail?id=275
+Last-Update: 2011-12-13
+
+--- a/test/test_art.py
++++ b/test/test_art.py
+@@ -14,7 +14,7 @@
+
+ """Tests for the album art fetchers."""
+
+-import unittest
++import unittest2 as unittest
+
+ import _common
+ from beets.autotag import art
+--- a/test/test_autotag.py
++++ b/test/test_autotag.py
+@@ -14,7 +14,7 @@
+
+ """Tests for autotagging functionality.
+ """
+-import unittest
++import unittest2 as unittest
+ 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 @@
+ """Test file manipulation functionality of Item.
+ """
+
+-import unittest
++import unittest2 as unittest
+ import shutil
+ import os
+ import stat
+--- a/test/test_importer.py
++++ b/test/test_importer.py
+@@ -14,7 +14,7 @@
+
+ """Tests for the general importer functionality.
+ """
+-import unittest
++import unittest2 as unittest
+ import os
+ import shutil
+
+--- a/test/test_mb.py
++++ b/test/test_mb.py
+@@ -14,7 +14,7 @@
+
+ """Tests for MusicBrainz API wrapper.
+ """
+-import unittest
++import unittest2 as unittest
+
+ import _common
+ from beets.autotag import mb
+--- a/test/test_mediafile.py
++++ b/test/test_mediafile.py
+@@ -15,7 +15,7 @@
+ """Specific, edge-case tests for the MediaFile metadata layer.
+ """
+
+-import unittest
++import unittest2 as unittest
+ import os
+ import shutil
+
+--- a/test/test_mediafile_basic.py
++++ b/test/test_mediafile_basic.py
+@@ -16,7 +16,7 @@
+ layer.
+ """
+
+-import unittest
++import unittest2 as unittest
+ import os
+ import shutil
+ import datetime
+--- a/test/test_pipeline.py
++++ b/test/test_pipeline.py
+@@ -15,7 +15,7 @@
+ """Test the "pipeline.py" restricted parallel programming library.
+ """
+
+-import unittest
++import unittest2 as unittest
+
+ import _common
+ from beets.util import pipeline
+--- a/test/test_player.py
++++ b/test/test_player.py
+@@ -15,7 +15,7 @@
+ """Tests for BPD and music playing.
+ """
+
+-import unittest
++import unittest2 as unittest
+
+ import _common
+ from beetsplug import bpd
+--- a/test/test_query.py
++++ b/test/test_query.py
+@@ -14,7 +14,7 @@
+
+ """Various tests for querying the library database.
+ """
+-import unittest
++import unittest2 as unittest
+ import os
+
+ import _common
+--- a/test/test_ui.py
++++ b/test/test_ui.py
+@@ -14,7 +14,7 @@
+
+ """Tests for the command-line interface.
+ """
+-import unittest
++import unittest2 as unittest
+ import os
+ import shutil
+ import textwrap
+--- a/test/test_vfs.py
++++ b/test/test_vfs.py
+@@ -13,7 +13,7 @@
+ # included in all copies or substantial portions of the Software.
+
+ """Tests for the virtual filesystem builder.."""
+-import unittest
++import unittest2 as unittest
+
+ import _common
+ from beets import library
+--- a/test/testall.py
++++ b/test/testall.py
+@@ -14,7 +14,7 @@
+ # The above copyright notice and this permission notice shall be
+ # included in all copies or substantial portions of the Software.
+
+-import unittest
++import unittest2 as unittest
+ import os
+ import re
+ import sys
Deleted: packages/beets/trunk/debian/repack.sh
===================================================================
--- packages/beets/trunk/debian/repack.sh 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/repack.sh 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,34 +0,0 @@
-#!/bin/sh
-set -eu
-VER=""
-while [ $# -gt 1 ]; do
- case "$1" in
- "--upstream-version")
- VER="$2"
- shift
- ;;
- *)
- echo "Unknown parameter $1" >&2
- exit 1
- ;;
- esac
- shift
-done
-INFILE="$1"
-shift
-
-echo "Repacking source to remove non-free files..."
-
-set -x
-PKG="beets"
-DIRNAME="$PKG-$VER+dfsg.orig"
-mkdir "$DIRNAME"
-tar -x --strip-component=1 -C "$DIRNAME" -f "$INFILE"
-cp /usr/share/javascript/backbone/backbone.js "$DIRNAME/beetsplug/web/static/backbone.js"
-cp /usr/share/javascript/jquery/jquery.js "$DIRNAME/beetsplug/web/static/jquery.js"
-cp /usr/share/javascript/underscore/underscore.js "$DIRNAME/beetsplug/web/static/underscore.js"
-find "$DIRNAME" -name '.DS_Store' -delete
-GZIP="--best" tar -cz --owner root --group root --mode a+rX \
- -f "${PKG}_$VER+dfsg.orig.tar.gz" "$DIRNAME"
-rm -f "$INFILE"
-rm -rf "$DIRNAME"
Modified: packages/beets/trunk/debian/rules
===================================================================
--- packages/beets/trunk/debian/rules 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/rules 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,13 +1,29 @@
#!/usr/bin/make -f
%:
- dh $@ --with python2
+ dh $@ --with python2,sphinxdoc
+override_dh_auto_build:
+ dh_auto_build
+ $(MAKE) -C docs html man BUILDDIR=$(CURDIR)/build/docs
+
+override_dh_auto_test:
+ set -e -x; \
+ for python in $(shell pyversions -r); do \
+ $$python setup.py test; \
+ done
+
override_dh_auto_install:
dh_auto_install -- --install-lib=/usr/share/beets/
mv debian/beets/usr/bin/beet debian/beets/usr/share/beets
dh_link /usr/share/beets/beet /usr/bin/beet
-override_dh_installman:
- rst2man debian/beet.rst > debian/beet.1
- dh_installman debian/beet.1
+override_dh_auto_clean:
+ dh_auto_clean
+ rm -rf build
+
+override_dh_installchangelogs:
+ dh_installchangelogs docs/changelog.rst
+
+override_dh_compress:
+ dh_compress -X.html -X.txt -X.inv
Modified: packages/beets/trunk/debian/watch
===================================================================
--- packages/beets/trunk/debian/watch 2011-12-12 23:10:01 UTC (rev 7943)
+++ packages/beets/trunk/debian/watch 2011-12-13 12:52:11 UTC (rev 7944)
@@ -1,5 +1,4 @@
version=3
opts=uversionmangle=s/b/~b/,dversionmangle=s/\+dfsg// \
-http://code.google.com/p/beets/downloads/list .*/beets-(.*)\.tar\.gz \
-debian debian/repack.sh
+http://code.google.com/p/beets/downloads/list .*/beets-(.*)\.tar\.gz
More information about the Python-apps-commits
mailing list