diff -urN --exclude CVS /ports/audio/picard/Makefile picard/Makefile
--- /ports/audio/picard/Makefile	2008-06-20 00:41:49.000000000 +0200
+++ picard/Makefile	2008-08-12 04:26:33.000000000 +0200
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	picard
-DISTVERSION=	0.9.0
-PORTREVISION=	2
+DISTVERSION=	0.10
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
-		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/
+		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
+		http://ftp.uk.musicbrainz.org/pub/musicbrainz/picard/
 
 MAINTAINER=	alexbl@FreeBSD.org
 COMMENT=	Next generation MusicBrainz Tagger
@@ -33,5 +33,6 @@
 		/with-avcodec/s|False|True|' ${WRKSRC}/setup.py
 	@${REINPLACE_CMD} -e 's|libdiscid.so.0|libdiscid.so.2|g' \
 		${WRKSRC}/picard/disc.py
+	@${REINPLACE_CMD} 's|<av|<ffmpeg/av|' ${WRKSRC}/picard/musicdns/avcodec.c
 
 .include <bsd.port.mk>
diff -urN --exclude CVS /ports/audio/picard/distinfo picard/distinfo
--- /ports/audio/picard/distinfo	2008-02-13 15:06:49.000000000 +0100
+++ picard/distinfo	2008-08-11 02:54:36.000000000 +0200
@@ -1,3 +1,3 @@
-MD5 (picard-0.9.0.tar.gz) = 51c6f1d512b5a4e95d385e1dfe2b8aab
-SHA256 (picard-0.9.0.tar.gz) = 5235de52a8e537b24be774a2ebdabd84679bf5adccf8a28766f8be9153a726b3
-SIZE (picard-0.9.0.tar.gz) = 401571
+MD5 (picard-0.10.tar.gz) = 6d4e31446d3a65cbc6ff880947bb500e
+SHA256 (picard-0.10.tar.gz) = dc86f5defcfef8e750e404369bdd1184b41cb944f3c37bb5bc5112ebab065777
+SIZE (picard-0.10.tar.gz) = 459526
diff -urN --exclude CVS /ports/audio/picard/pkg-plist picard/pkg-plist
--- /ports/audio/picard/pkg-plist	2008-02-13 15:06:49.000000000 +0100
+++ picard/pkg-plist	2008-08-12 04:31:20.000000000 +0200
@@ -1,291 +1,298 @@
 bin/picard
 %%PYTHON_SITELIBDIR%%/picard/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/__init__.pyo
 %%PYTHON_SITELIBDIR%%/picard/album.py
-%%PYTHON_SITELIBDIR%%/picard/album.pyc
-%%PYTHON_SITELIBDIR%%/picard/album.pyo
 %%PYTHON_SITELIBDIR%%/picard/artist.py
-%%PYTHON_SITELIBDIR%%/picard/artist.pyc
-%%PYTHON_SITELIBDIR%%/picard/artist.pyo
-%%PYTHON_SITELIBDIR%%/picard/browser/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/browser/browser.py
-%%PYTHON_SITELIBDIR%%/picard/browser/browser.pyc
-%%PYTHON_SITELIBDIR%%/picard/browser/browser.pyo
-%%PYTHON_SITELIBDIR%%/picard/browser/filelookup.py
-%%PYTHON_SITELIBDIR%%/picard/browser/filelookup.pyc
-%%PYTHON_SITELIBDIR%%/picard/browser/filelookup.pyo
 %%PYTHON_SITELIBDIR%%/picard/cluster.py
-%%PYTHON_SITELIBDIR%%/picard/cluster.pyc
-%%PYTHON_SITELIBDIR%%/picard/cluster.pyo
 %%PYTHON_SITELIBDIR%%/picard/config.py
-%%PYTHON_SITELIBDIR%%/picard/config.pyc
-%%PYTHON_SITELIBDIR%%/picard/config.pyo
 %%PYTHON_SITELIBDIR%%/picard/const.py
-%%PYTHON_SITELIBDIR%%/picard/const.pyc
-%%PYTHON_SITELIBDIR%%/picard/const.pyo
 %%PYTHON_SITELIBDIR%%/picard/dataobj.py
-%%PYTHON_SITELIBDIR%%/picard/dataobj.pyc
-%%PYTHON_SITELIBDIR%%/picard/dataobj.pyo
 %%PYTHON_SITELIBDIR%%/picard/disc.py
-%%PYTHON_SITELIBDIR%%/picard/disc.pyc
-%%PYTHON_SITELIBDIR%%/picard/disc.pyo
 %%PYTHON_SITELIBDIR%%/picard/file.py
-%%PYTHON_SITELIBDIR%%/picard/file.pyc
-%%PYTHON_SITELIBDIR%%/picard/file.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/formats/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/apev2.py
-%%PYTHON_SITELIBDIR%%/picard/formats/apev2.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/apev2.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/asf.py
-%%PYTHON_SITELIBDIR%%/picard/formats/asf.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/asf.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/id3.py
-%%PYTHON_SITELIBDIR%%/picard/formats/id3.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/id3.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/mp4.py
-%%PYTHON_SITELIBDIR%%/picard/formats/mp4.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/mp4.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/compatid3.py
-%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/compatid3.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/compatid3.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/vorbis.py
-%%PYTHON_SITELIBDIR%%/picard/formats/vorbis.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/vorbis.pyo
-%%PYTHON_SITELIBDIR%%/picard/formats/wav.py
-%%PYTHON_SITELIBDIR%%/picard/formats/wav.pyc
-%%PYTHON_SITELIBDIR%%/picard/formats/wav.pyo
 %%PYTHON_SITELIBDIR%%/picard/log.py
-%%PYTHON_SITELIBDIR%%/picard/log.pyc
-%%PYTHON_SITELIBDIR%%/picard/log.pyo
 %%PYTHON_SITELIBDIR%%/picard/mbxml.py
-%%PYTHON_SITELIBDIR%%/picard/mbxml.pyc
-%%PYTHON_SITELIBDIR%%/picard/mbxml.pyo
 %%PYTHON_SITELIBDIR%%/picard/metadata.py
-%%PYTHON_SITELIBDIR%%/picard/metadata.pyc
-%%PYTHON_SITELIBDIR%%/picard/metadata.pyo
-%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/musicdns/avcodec.so
-%%PYTHON_SITELIBDIR%%/picard/musicdns/ofa.so
 %%PYTHON_SITELIBDIR%%/picard/parsefilename.py
-%%PYTHON_SITELIBDIR%%/picard/parsefilename.pyc
-%%PYTHON_SITELIBDIR%%/picard/parsefilename.pyo
 %%PYTHON_SITELIBDIR%%/picard/playlist.py
-%%PYTHON_SITELIBDIR%%/picard/playlist.pyc
-%%PYTHON_SITELIBDIR%%/picard/playlist.pyo
 %%PYTHON_SITELIBDIR%%/picard/plugin.py
-%%PYTHON_SITELIBDIR%%/picard/plugin.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugin.pyo
-%%PYTHON_SITELIBDIR%%/picard/plugins/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/plugins/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/plugins/__init__.pyo
 %%PYTHON_SITELIBDIR%%/picard/puidmanager.py
-%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyc
-%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyo
 %%PYTHON_SITELIBDIR%%/picard/resources.py
-%%PYTHON_SITELIBDIR%%/picard/resources.pyc
-%%PYTHON_SITELIBDIR%%/picard/resources.pyo
 %%PYTHON_SITELIBDIR%%/picard/script.py
-%%PYTHON_SITELIBDIR%%/picard/script.pyc
-%%PYTHON_SITELIBDIR%%/picard/script.pyo
 %%PYTHON_SITELIBDIR%%/picard/similarity.py
-%%PYTHON_SITELIBDIR%%/picard/similarity.pyc
-%%PYTHON_SITELIBDIR%%/picard/similarity.pyo
 %%PYTHON_SITELIBDIR%%/picard/tagger.py
-%%PYTHON_SITELIBDIR%%/picard/tagger.pyc
-%%PYTHON_SITELIBDIR%%/picard/tagger.pyo
 %%PYTHON_SITELIBDIR%%/picard/track.py
-%%PYTHON_SITELIBDIR%%/picard/track.pyc
-%%PYTHON_SITELIBDIR%%/picard/track.pyo
+%%PYTHON_SITELIBDIR%%/picard/webservice.py
+%%PYTHON_SITELIBDIR%%/picard/browser/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/browser/browser.py
+%%PYTHON_SITELIBDIR%%/picard/browser/filelookup.py
+%%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/browser/browser.pyc
+%%PYTHON_SITELIBDIR%%/picard/browser/filelookup.pyc
+%%PYTHON_SITELIBDIR%%/picard/browser/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/browser/browser.pyo
+%%PYTHON_SITELIBDIR%%/picard/browser/filelookup.pyo
+%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/musicdns/ofa.so
+%%PYTHON_SITELIBDIR%%/picard/musicdns/avcodec.so
+%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/musicdns/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/plugins/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/plugins/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugins/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/formats/apev2.py
+%%PYTHON_SITELIBDIR%%/picard/formats/asf.py
+%%PYTHON_SITELIBDIR%%/picard/formats/id3.py
+%%PYTHON_SITELIBDIR%%/picard/formats/mp4.py
+%%PYTHON_SITELIBDIR%%/picard/formats/vorbis.py
+%%PYTHON_SITELIBDIR%%/picard/formats/wav.py
+%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/__init__.py
+%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/compatid3.py
+%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/compatid3.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/mutagenext/compatid3.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/apev2.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/asf.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/id3.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/mp4.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/vorbis.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/wav.pyc
+%%PYTHON_SITELIBDIR%%/picard/formats/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/apev2.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/asf.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/id3.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/mp4.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/vorbis.pyo
+%%PYTHON_SITELIBDIR%%/picard/formats/wav.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/ui/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/__init__.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.py
-%%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.py
-%%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/filebrowser.py
-%%PYTHON_SITELIBDIR%%/picard/ui/filebrowser.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/filebrowser.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/item.py
-%%PYTHON_SITELIBDIR%%/picard/ui/item.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/item.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/itemviews.py
-%%PYTHON_SITELIBDIR%%/picard/ui/itemviews.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/itemviews.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/logview.py
-%%PYTHON_SITELIBDIR%%/picard/ui/logview.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/logview.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/mainwindow.py
-%%PYTHON_SITELIBDIR%%/picard/ui/mainwindow.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/mainwindow.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/metadatabox.py
-%%PYTHON_SITELIBDIR%%/picard/ui/metadatabox.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/metadatabox.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.py
+%%PYTHON_SITELIBDIR%%/picard/ui/tageditor.py
+%%PYTHON_SITELIBDIR%%/picard/ui/tagsfromfilenames.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_cdlookup.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_edittagdialog.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_metadata.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_about.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cover.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_tageditor.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup_win32.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_folksonomy.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_general.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_interface.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_matching.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_metadata.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_naming.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_plugins.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_proxy.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_script.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_tags.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.py
+%%PYTHON_SITELIBDIR%%/picard/ui/util.py
 %%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/about.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/about.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/about.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/advanced.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/advanced.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/advanced.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/cdlookup.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/cdlookup.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/cdlookup.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/cover.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/cover.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/cover.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/dialog.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/dialog.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/dialog.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/folksonomy.py
 %%PYTHON_SITELIBDIR%%/picard/ui/options/general.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/general.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/general.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/interface.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/interface.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/interface.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/matching.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/matching.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/matching.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/metadata.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/metadata.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/metadata.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/naming.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/naming.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/naming.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/plugins.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/plugins.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/plugins.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/scripting.py
-%%PYTHON_SITELIBDIR%%/picard/ui/options/scripting.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/options/scripting.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/tags.py
+%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/about.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/advanced.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/cdlookup.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/cover.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/dialog.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/folksonomy.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/general.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/interface.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/matching.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/metadata.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/naming.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/plugins.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/scripting.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/options/tags.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/options/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/about.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/advanced.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/cdlookup.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/cover.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/dialog.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/folksonomy.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/general.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/interface.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/matching.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/metadata.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/naming.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/plugins.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/proxy.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/options/scripting.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/options/tags.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.py
+%%PYTHON_SITELIBDIR%%/picard/ui/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/filebrowser.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/item.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/itemviews.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/logview.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/mainwindow.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/metadatabox.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/tageditor.py
 %%PYTHON_SITELIBDIR%%/picard/ui/tageditor.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/tageditor.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/tagsfromfilenames.py
 %%PYTHON_SITELIBDIR%%/picard/ui/tagsfromfilenames.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/tagsfromfilenames.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_cdlookup.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_cdlookup.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_cdlookup.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_edittagdialog.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_edittagdialog.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_edittagdialog.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_metadata.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_metadata.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_metadata.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_about.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_about.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_about.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup_win32.py
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup_win32.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup_win32.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cover.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cover.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cover.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_general.py
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_tageditor.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup_win32.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_folksonomy.pyc
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_general.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_general.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_interface.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_interface.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_interface.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_matching.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_matching.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_matching.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_metadata.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_metadata.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_metadata.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_naming.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_naming.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_naming.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_plugins.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_plugins.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_plugins.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_proxy.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_proxy.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_proxy.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_script.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_script.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_script.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_tags.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_options_tags.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_tags.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_tageditor.py
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_tageditor.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_tageditor.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.py
 %%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.pyc
-%%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.pyo
-%%PYTHON_SITELIBDIR%%/picard/ui/util.py
 %%PYTHON_SITELIBDIR%%/picard/ui/util.pyc
+%%PYTHON_SITELIBDIR%%/picard/ui/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/cdlookup.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/coverartbox.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/filebrowser.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/item.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/itemviews.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/logview.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/mainwindow.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/metadatabox.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/puidsubmit.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/tageditor.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/tagsfromfilenames.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_cdlookup.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_edittagdialog.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_metadata.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_about.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cover.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_tageditor.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_cdlookup_win32.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_folksonomy.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_general.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_interface.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_matching.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_metadata.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_naming.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_plugins.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_proxy.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_script.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_options_tags.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_puidsubmit.pyo
+%%PYTHON_SITELIBDIR%%/picard/ui/ui_tagsfromfilenames.pyo
 %%PYTHON_SITELIBDIR%%/picard/ui/util.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/__init__.py
-%%PYTHON_SITELIBDIR%%/picard/util/__init__.pyc
-%%PYTHON_SITELIBDIR%%/picard/util/__init__.pyo
-%%PYTHON_SITELIBDIR%%/picard/util/astrcmp.so
 %%PYTHON_SITELIBDIR%%/picard/util/cdrom.py
-%%PYTHON_SITELIBDIR%%/picard/util/cdrom.pyc
-%%PYTHON_SITELIBDIR%%/picard/util/cdrom.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/icontheme.py
-%%PYTHON_SITELIBDIR%%/picard/util/icontheme.pyc
-%%PYTHON_SITELIBDIR%%/picard/util/icontheme.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/queue.py
-%%PYTHON_SITELIBDIR%%/picard/util/queue.pyc
-%%PYTHON_SITELIBDIR%%/picard/util/queue.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/tags.py
-%%PYTHON_SITELIBDIR%%/picard/util/tags.pyc
-%%PYTHON_SITELIBDIR%%/picard/util/tags.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/thread.py
-%%PYTHON_SITELIBDIR%%/picard/util/thread.pyc
-%%PYTHON_SITELIBDIR%%/picard/util/thread.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/webbrowser2.py
+%%PYTHON_SITELIBDIR%%/picard/util/astrcmp.so
+%%PYTHON_SITELIBDIR%%/picard/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/util/cdrom.pyc
+%%PYTHON_SITELIBDIR%%/picard/util/icontheme.pyc
+%%PYTHON_SITELIBDIR%%/picard/util/queue.pyc
+%%PYTHON_SITELIBDIR%%/picard/util/tags.pyc
+%%PYTHON_SITELIBDIR%%/picard/util/thread.pyc
 %%PYTHON_SITELIBDIR%%/picard/util/webbrowser2.pyc
+%%PYTHON_SITELIBDIR%%/picard/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/util/cdrom.pyo
+%%PYTHON_SITELIBDIR%%/picard/util/icontheme.pyo
+%%PYTHON_SITELIBDIR%%/picard/util/queue.pyo
+%%PYTHON_SITELIBDIR%%/picard/util/tags.pyo
+%%PYTHON_SITELIBDIR%%/picard/util/thread.pyo
 %%PYTHON_SITELIBDIR%%/picard/util/webbrowser2.pyo
-%%PYTHON_SITELIBDIR%%/picard/webservice.py
+%%PYTHON_SITELIBDIR%%/picard/__init__.pyc
+%%PYTHON_SITELIBDIR%%/picard/album.pyc
+%%PYTHON_SITELIBDIR%%/picard/artist.pyc
+%%PYTHON_SITELIBDIR%%/picard/cluster.pyc
+%%PYTHON_SITELIBDIR%%/picard/config.pyc
+%%PYTHON_SITELIBDIR%%/picard/const.pyc
+%%PYTHON_SITELIBDIR%%/picard/dataobj.pyc
+%%PYTHON_SITELIBDIR%%/picard/disc.pyc
+%%PYTHON_SITELIBDIR%%/picard/file.pyc
+%%PYTHON_SITELIBDIR%%/picard/log.pyc
+%%PYTHON_SITELIBDIR%%/picard/mbxml.pyc
+%%PYTHON_SITELIBDIR%%/picard/metadata.pyc
+%%PYTHON_SITELIBDIR%%/picard/parsefilename.pyc
+%%PYTHON_SITELIBDIR%%/picard/playlist.pyc
+%%PYTHON_SITELIBDIR%%/picard/plugin.pyc
+%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyc
+%%PYTHON_SITELIBDIR%%/picard/resources.pyc
+%%PYTHON_SITELIBDIR%%/picard/script.pyc
+%%PYTHON_SITELIBDIR%%/picard/similarity.pyc
+%%PYTHON_SITELIBDIR%%/picard/tagger.pyc
+%%PYTHON_SITELIBDIR%%/picard/track.pyc
 %%PYTHON_SITELIBDIR%%/picard/webservice.pyc
+%%PYTHON_SITELIBDIR%%/picard/__init__.pyo
+%%PYTHON_SITELIBDIR%%/picard/album.pyo
+%%PYTHON_SITELIBDIR%%/picard/artist.pyo
+%%PYTHON_SITELIBDIR%%/picard/cluster.pyo
+%%PYTHON_SITELIBDIR%%/picard/config.pyo
+%%PYTHON_SITELIBDIR%%/picard/const.pyo
+%%PYTHON_SITELIBDIR%%/picard/dataobj.pyo
+%%PYTHON_SITELIBDIR%%/picard/disc.pyo
+%%PYTHON_SITELIBDIR%%/picard/file.pyo
+%%PYTHON_SITELIBDIR%%/picard/log.pyo
+%%PYTHON_SITELIBDIR%%/picard/mbxml.pyo
+%%PYTHON_SITELIBDIR%%/picard/metadata.pyo
+%%PYTHON_SITELIBDIR%%/picard/parsefilename.pyo
+%%PYTHON_SITELIBDIR%%/picard/playlist.pyo
+%%PYTHON_SITELIBDIR%%/picard/plugin.pyo
+%%PYTHON_SITELIBDIR%%/picard/puidmanager.pyo
+%%PYTHON_SITELIBDIR%%/picard/resources.pyo
+%%PYTHON_SITELIBDIR%%/picard/script.pyo
+%%PYTHON_SITELIBDIR%%/picard/similarity.pyo
+%%PYTHON_SITELIBDIR%%/picard/tagger.pyo
+%%PYTHON_SITELIBDIR%%/picard/track.pyo
 %%PYTHON_SITELIBDIR%%/picard/webservice.pyo
-share/applications/picard.desktop
-share/icons/picard-16.png
-share/icons/picard-32.png
+%%PYTHON_SITELIBDIR%%/picard-0.10-py2.5.egg-info
 share/locale/cs/LC_MESSAGES/picard.mo
 share/locale/da/LC_MESSAGES/picard.mo
 share/locale/de/LC_MESSAGES/picard.mo
+share/locale/en/LC_MESSAGES/picard.mo
+share/locale/en_CA/LC_MESSAGES/picard.mo
 share/locale/en_GB/LC_MESSAGES/picard.mo
 share/locale/es/LC_MESSAGES/picard.mo
+share/locale/fa/LC_MESSAGES/picard.mo
 share/locale/fi/LC_MESSAGES/picard.mo
 share/locale/fr/LC_MESSAGES/picard.mo
-share/locale/fy/LC_MESSAGES/picard.mo
+share/locale/he/LC_MESSAGES/picard.mo
 share/locale/hu/LC_MESSAGES/picard.mo
 share/locale/is/LC_MESSAGES/picard.mo
 share/locale/it/LC_MESSAGES/picard.mo
@@ -299,17 +306,18 @@
 share/locale/ro/LC_MESSAGES/picard.mo
 share/locale/ru/LC_MESSAGES/picard.mo
 share/locale/sk/LC_MESSAGES/picard.mo
+share/locale/sl/LC_MESSAGES/picard.mo
 share/locale/sv/LC_MESSAGES/picard.mo
-@dirrm %%PYTHON_SITELIBDIR%%/picard/browser
+share/locale/zh_CN/LC_MESSAGES/picard.mo
+share/locale/fy/LC_MESSAGES/picard.mo
+@dirrmtry share/locale/fy/LC_MESSAGES
+@dirrmtry share/locale/fy
+@dirrm %%PYTHON_SITELIBDIR%%/picard/util
+@dirrm %%PYTHON_SITELIBDIR%%/picard/ui/options
+@dirrm %%PYTHON_SITELIBDIR%%/picard/ui
 @dirrm %%PYTHON_SITELIBDIR%%/picard/formats/mutagenext
 @dirrm %%PYTHON_SITELIBDIR%%/picard/formats
-@dirrm %%PYTHON_SITELIBDIR%%/picard/musicdns
 @dirrm %%PYTHON_SITELIBDIR%%/picard/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/picard/ui/options
-@dirrm %%PYTHON_SITELIBDIR%%/picard/ui
-@dirrm %%PYTHON_SITELIBDIR%%/picard/util
+@dirrm %%PYTHON_SITELIBDIR%%/picard/musicdns
+@dirrm %%PYTHON_SITELIBDIR%%/picard/browser
 @dirrm %%PYTHON_SITELIBDIR%%/picard
-@dirrmtry share/applications
-@dirrmtry share/icons
-@dirrmtry share/locale/fy/LC_MESSAGES
-@dirrmtry share/locale/fy