update to 1.6.2

This is a major update - many bugfixes and UI improvements.

4 files changed, 76 insertions, 21 deletions

diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index e0faf7ce878..0a05caf1d7b 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2009/02/11 13:46:59 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2009/05/26 18:24:58 drochner Exp $
 #
 
-DISTNAME=	sonata-1.5.2
+DISTNAME=	sonata-1.6.2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.berlios.de/sonata/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/audio/sonata/PLIST b/audio/sonata/PLIST
index b2897dea453..b3932f89524 100644
--- a/audio/sonata/PLIST
+++ b/audio/sonata/PLIST
@@ -1,15 +1,45 @@
-@comment $NetBSD: PLIST,v 1.3 2008/06/23 16:51:46 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/05/26 18:24:58 drochner Exp $
 bin/sonata
 ${PYSITELIB}/mmkeys.so
 ${PYSITELIB}/sonata/__init__.py
 ${PYSITELIB}/sonata/__init__.pyc
 ${PYSITELIB}/sonata/__init__.pyo
+${PYSITELIB}/sonata/about.py
+${PYSITELIB}/sonata/about.pyc
+${PYSITELIB}/sonata/about.pyo
+${PYSITELIB}/sonata/artwork.py
+${PYSITELIB}/sonata/artwork.pyc
+${PYSITELIB}/sonata/artwork.pyo
 ${PYSITELIB}/sonata/audioscrobbler.py
 ${PYSITELIB}/sonata/audioscrobbler.pyc
 ${PYSITELIB}/sonata/audioscrobbler.pyo
+${PYSITELIB}/sonata/breadcrumbs.py
+${PYSITELIB}/sonata/breadcrumbs.pyc
+${PYSITELIB}/sonata/breadcrumbs.pyo
+${PYSITELIB}/sonata/cli.py
+${PYSITELIB}/sonata/cli.pyc
+${PYSITELIB}/sonata/cli.pyo
+${PYSITELIB}/sonata/config.py
+${PYSITELIB}/sonata/config.pyc
+${PYSITELIB}/sonata/config.pyo
+${PYSITELIB}/sonata/consts.py
+${PYSITELIB}/sonata/consts.pyc
+${PYSITELIB}/sonata/consts.pyo
+${PYSITELIB}/sonata/current.py
+${PYSITELIB}/sonata/current.pyc
+${PYSITELIB}/sonata/current.pyo
+${PYSITELIB}/sonata/dbus_plugin.py
+${PYSITELIB}/sonata/dbus_plugin.pyc
+${PYSITELIB}/sonata/dbus_plugin.pyo
 ${PYSITELIB}/sonata/img.py
 ${PYSITELIB}/sonata/img.pyc
 ${PYSITELIB}/sonata/img.pyo
+${PYSITELIB}/sonata/info.py
+${PYSITELIB}/sonata/info.pyc
+${PYSITELIB}/sonata/info.pyo
+${PYSITELIB}/sonata/library.py
+${PYSITELIB}/sonata/library.pyc
+${PYSITELIB}/sonata/library.pyo
 ${PYSITELIB}/sonata/main.py
 ${PYSITELIB}/sonata/main.pyc
 ${PYSITELIB}/sonata/main.pyo
@@ -19,12 +49,45 @@ ${PYSITELIB}/sonata/misc.pyo
 ${PYSITELIB}/sonata/mpdhelper.py
 ${PYSITELIB}/sonata/mpdhelper.pyc
 ${PYSITELIB}/sonata/mpdhelper.pyo
+${PYSITELIB}/sonata/playlists.py
+${PYSITELIB}/sonata/playlists.pyc
+${PYSITELIB}/sonata/playlists.pyo
+${PYSITELIB}/sonata/plugins/__init__.py
+${PYSITELIB}/sonata/plugins/__init__.pyc
+${PYSITELIB}/sonata/plugins/__init__.pyo
+${PYSITELIB}/sonata/plugins/localmpd.py
+${PYSITELIB}/sonata/plugins/localmpd.pyc
+${PYSITELIB}/sonata/plugins/localmpd.pyo
+${PYSITELIB}/sonata/plugins/test.py
+${PYSITELIB}/sonata/plugins/test.pyc
+${PYSITELIB}/sonata/plugins/test.pyo
+${PYSITELIB}/sonata/pluginsystem.py
+${PYSITELIB}/sonata/pluginsystem.pyc
+${PYSITELIB}/sonata/pluginsystem.pyo
+${PYSITELIB}/sonata/preferences.py
+${PYSITELIB}/sonata/preferences.pyc
+${PYSITELIB}/sonata/preferences.pyo
+${PYSITELIB}/sonata/scrobbler.py
+${PYSITELIB}/sonata/scrobbler.pyc
+${PYSITELIB}/sonata/scrobbler.pyo
+${PYSITELIB}/sonata/streams.py
+${PYSITELIB}/sonata/streams.pyc
+${PYSITELIB}/sonata/streams.pyo
+${PYSITELIB}/sonata/svnversion.py
+${PYSITELIB}/sonata/svnversion.pyc
+${PYSITELIB}/sonata/svnversion.pyo
+${PYSITELIB}/sonata/tagedit.py
+${PYSITELIB}/sonata/tagedit.pyc
+${PYSITELIB}/sonata/tagedit.pyo
 ${PYSITELIB}/sonata/tray.py
 ${PYSITELIB}/sonata/tray.pyc
 ${PYSITELIB}/sonata/tray.pyo
 ${PYSITELIB}/sonata/ui.py
 ${PYSITELIB}/sonata/ui.pyc
 ${PYSITELIB}/sonata/ui.pyo
+${PYSITELIB}/sonata/version.py
+${PYSITELIB}/sonata/version.pyc
+${PYSITELIB}/sonata/version.pyo
 man/man1/sonata.1
 share/applications/sonata.desktop
 share/locale/ar/LC_MESSAGES/sonata.mo
@@ -33,19 +96,24 @@ share/locale/ca/LC_MESSAGES/sonata.mo
 share/locale/cs/LC_MESSAGES/sonata.mo
 share/locale/da/LC_MESSAGES/sonata.mo
 share/locale/de/LC_MESSAGES/sonata.mo
+share/locale/el_GR/LC_MESSAGES/sonata.mo
 share/locale/es/LC_MESSAGES/sonata.mo
 share/locale/et/LC_MESSAGES/sonata.mo
 share/locale/fi/LC_MESSAGES/sonata.mo
 share/locale/fr/LC_MESSAGES/sonata.mo
 share/locale/it/LC_MESSAGES/sonata.mo
+share/locale/ja/LC_MESSAGES/sonata.mo
 share/locale/nl/LC_MESSAGES/sonata.mo
 share/locale/pl/LC_MESSAGES/sonata.mo
 share/locale/pt_BR/LC_MESSAGES/sonata.mo
 share/locale/ru/LC_MESSAGES/sonata.mo
+share/locale/sk/LC_MESSAGES/sonata.mo
+share/locale/sl/LC_MESSAGES/sonata.mo
 share/locale/sv/LC_MESSAGES/sonata.mo
 share/locale/tr/LC_MESSAGES/sonata.mo
 share/locale/uk/LC_MESSAGES/sonata.mo
 share/locale/zh_CN/LC_MESSAGES/sonata.mo
+share/locale/zh_TW/LC_MESSAGES/sonata.mo
 share/pixmaps/sonata-album.png
 share/pixmaps/sonata-artist.png
 share/pixmaps/sonata-case.png
@@ -68,4 +136,5 @@ share/sonata/TRANSLATORS
 @comment in xdg-dirs: @dirrm share/pixmaps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm ${PYSITELIB}/sonata/plugins
 @dirrm ${PYSITELIB}/sonata
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index 4190cfd8ba6..09a1e70ee0a 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2008/06/23 16:51:46 drochner Exp $
+$NetBSD: distinfo,v 1.4 2009/05/26 18:24:58 drochner Exp $
 
-SHA1 (sonata-1.5.2.tar.bz2) = 0d6e514a7f5ae025fa96532613d1f70e3d3e2d10
-RMD160 (sonata-1.5.2.tar.bz2) = 5f79cae6a6367d2a7a1ce17f2a104707e3c9f7a8
-Size (sonata-1.5.2.tar.bz2) = 262913 bytes
+SHA1 (sonata-1.6.2.tar.bz2) = 33cb3458014b4901eb312bff76c24be125ed7d0a
+RMD160 (sonata-1.6.2.tar.bz2) = 418eef732cc171d21e301261aa0c6b7751d03ab3
+Size (sonata-1.6.2.tar.bz2) = 315918 bytes
 SHA1 (patch-aa) = 0c323085df89557ef9bdc96f03e0997ddb1644f7
-SHA1 (patch-ab) = f6eced504106a407d5685ac1492e6cef2bed12e0
diff --git a/audio/sonata/patches/patch-ab b/audio/sonata/patches/patch-ab
deleted file mode 100644
index 74051a609de..00000000000
--- a/audio/sonata/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2008/05/05 10:41:22 drochner Exp $
-
---- sonata/main.py.orig	2008-05-04 02:30:45.000000000 +0200
-+++ sonata/main.py
-@@ -4201,7 +4201,7 @@ class Base:
- 				from xml.etree import ElementTree
- 			except:
- 				try: # Python 2.4, separate module:
--					from elementtree.ElementTree import ElementTree
-+					from elementtree import ElementTree
- 				except:
- 					sys.stderr.write("Sonata requires Python 2.5 or python-elementtree. Aborting... \n")
- 					sys.exit(1)