summaryrefslogtreecommitdiff
path: root/audio/amarok
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-02-16 09:01:46 +0000
committerwiz <wiz@pkgsrc.org>2010-02-16 09:01:46 +0000
commitf2fb550aedd216b72f376c093bd75959825c5685 (patch)
tree272dbe0d347f5a734d739d6e3cfb1e8d38a436c7 /audio/amarok
parent777266b08934799fe5f835622c87e014ea25d0f8 (diff)
downloadpkgsrc-f2fb550aedd216b72f376c093bd75959825c5685.tar.gz
Update to 2.2.2nb3 from wip, packaged by myself.
This is the KDE4 version of amarok, lots of changes. Try it out!
Diffstat (limited to 'audio/amarok')
-rw-r--r--audio/amarok/DESCR2
-rw-r--r--audio/amarok/Makefile124
-rw-r--r--audio/amarok/PLIST1451
-rw-r--r--audio/amarok/distinfo15
-rw-r--r--audio/amarok/options.mk46
-rw-r--r--audio/amarok/patches/patch-aa401
-rw-r--r--audio/amarok/patches/patch-ab32
-rw-r--r--audio/amarok/patches/patch-ac27
-rw-r--r--audio/amarok/patches/patch-ad89
9 files changed, 999 insertions, 1188 deletions
diff --git a/audio/amarok/DESCR b/audio/amarok/DESCR
index 39ebf407d2f..74f1d2faacd 100644
--- a/audio/amarok/DESCR
+++ b/audio/amarok/DESCR
@@ -4,3 +4,5 @@ interface, that doesn't get in the way of the user. How many buttons
do you have to press for simply adding some new tracks to the
playlist? amaroK tries to be a little different, providing a simple
drag and drop interface, that really makes playlist handling easy.
+
+This package contains the KDE4 version of amarok.
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 90a36c041dc..af10538a4b8 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,87 +1,61 @@
-# $NetBSD: Makefile,v 1.78 2010/02/16 08:58:49 wiz Exp $
-
-DISTNAME= amarok-${VERSION}
-VERSION= 1.4.10
-PKGREVISION= 9
-CATEGORIES= audio kde
-MASTER_SITES= ${MASTER_SITE_KDE:=amarok/${VERSION}/src/}
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= wiz@NetBSD.org
-HOMEPAGE= http://amarok.kde.org/
-COMMENT= KDE audio player
+# $NetBSD: Makefile,v 1.79 2010/02/16 09:01:46 wiz Exp $
+#
+
+DISTNAME= amarok-${VERS}
+VERS= 2.2.2
+PKGREVISION= 3
+CATEGORIES= audio multimedia
+#MASTER_SITES= http://download.kde.org/unstable/amarok/${VERS}/src/ \
+# ftp://gd.tuwien.ac.at/kde/unstable/amarok/${VERS}/src/
+MASTER_SITES= http://download.kde.org/stable/amarok/${VERS}/src/ \
+ ftp://gd.tuwien.ac.at/kde/stable/amarok/${VERS}/src/
+EXTRACT_SUFX= .tar.bz2
+
+MAINTAINER= wiz@NetBSD.org
+HOMEPAGE= http://amarok.kde.org/
+COMMENT= KDE4 audio player
+LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2 AND gnu-lgpl-v2.1
+
+BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4
+DEPENDS+= moodbar-[0-9]*:../../audio/moodbar
PKG_DESTDIR_SUPPORT= user-destdir
-DEPENDS+= unzip-[0-9]*:../../archivers/unzip
-
-USE_TOOLS+= gmake pkg-config msgfmt
-USE_LANGUAGES= c c++
-GNU_CONFIGURE= yes
-USE_LIBTOOL= yes
-
-CONFIGURE_ARGS+= --without-nmm
-CONFIGURE_ARGS+= --without-mas
-CONFIGURE_ARGS+= --without-helix
-CONFIGURE_ARGS+= --with-mp4v2
-CONFIGURE_ARGS+= --with-mp4v2-dir=${BUILDLINK_PREFIX.libmp4v2}
-
-LIBS+= ${LIBOSSAUDIO}
-
-PYTHON_PATCH_SCRIPTS= \
- amarok/src/scripts/common/Publisher.py \
- amarok/src/scripts/common/Zeroconf.py \
- amarok/src/scripts/playlist2html/Playlist.py \
- amarok/src/scripts/webcontrol/Playlist.py \
- amarok/src/scripts/playlist2html/PlaylistServer.py \
- amarok/src/scripts/playlist2html/playlist2html.py \
- amarok/src/scripts/templates/python_qt_template.py \
- amarok/src/scripts/webcontrol/Globals.py \
- amarok/src/scripts/playlist2html/Playlist.py \
- amarok/src/scripts/webcontrol/Playlist.py \
- amarok/src/scripts/webcontrol/RequestHandler.py \
- amarok/src/scripts/webcontrol/WebControl.py \
- amarok/src/scripts/webcontrol/WebPublisher.py
-REPLACE_RUBY= \
- amarok/src/amarok_proxy.rb \
- amarok/src/mediadevice/daap/amarok_daapserver.rb \
- amarok/src/scripts/lyrics_astraweb/lyrics_astraweb.rb \
- amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb \
- amarok/src/scripts/ruby_debug/debug.rb \
- amarok/src/scripts/score_default/score_default.rb \
- amarok/src/scripts/score_impulsive/score_impulsive.rb \
- amarok/src/scripts/templates/amarok.rb \
- amarok/src/scripts/templates/ruby_qt_template.rb
+USE_CMAKE= yes
+USE_LANGUAGES= c c++
+USE_TOOLS+= msgfmt pkg-config
-SUBST_CLASSES+= dotkdedir
-SUBST_STAGE.dotkdedir= post-patch
-SUBST_MESSAGE.dotkdedir=Replacing .kde/share with .kde/share/kde
-SUBST_FILES.dotkdedir= \
- amarok/src/scripts/playlist2html/Playlist.py \
- amarok/src/scripts/webcontrol/Playlist.py \
- doc/*/config.docbook doc/*/faq.docbook doc/*/advanced.docbook
-SUBST_SED.dotkdedir= -e 's,\.kde/share/,.kde/share/kde/,'
+CMAKE_ARGS+= -DMYSQL_INCLUDE_DIR:PATH=${BUILDLINK_PREFIX.mysql-embedded}/mysqld/include/mysql
+CMAKE_ARGS+= -DMYSQL_EMBEDDED_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-embedded}/mysqld/lib/mysql/libmysqld.a
+CMAKE_ARGS+= -DMYSQL_EMBEDDED_FOUND:BOOL=TRUE
+CMAKE_ARGS+= -DHAVE_MYSQL_OPT_EMBEDDED_CONNECTION:BOOL=TRUE
+CMAKE_ARGS+= -DMYSQL_LIBRARIES:PATH=${BUILDLINK_PREFIX.mysql-embedded}/mysqld/lib/mysql/libmysqlclient.so
-BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.3.0
-BUILDLINK_API_DEPENDS.kdelibs+= kdelibs>=3.3.0
-BUILDLINK_API_DEPENDS.taglib+= taglib>=1.4
+SUBST_CLASSES+= mysql
+SUBST_STAGE.mysql= post-patch
+SUBST_MESSAGE.mysql= Fixup paths for MySQL embedded
+SUBST_FILES.mysql= cmake/modules/FindMySQLAmarok.cmake
+SUBST_FILES.mysql+= src/collection/mysqlecollection/CMakeLists.txt
+SUBST_SED.mysql= -e s:/opt/mysqle/:${BUILDLINK_PREFIX.mysql-embedded}/mysqld:
+SUBST_SED.mysql+= -e s:@@WLR@@:${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.mysql-embedded}/mysqld/lib/mysql:
.include "options.mk"
-.include "../../audio/libtunepimp/buildlink3.mk"
-.include "../../audio/libvisual/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
+.include "../../audio/liblastfm/buildlink3.mk"
+BUILDLINK_API_DEPENDS.taglib+= taglib>=1.6nb1
.include "../../audio/taglib/buildlink3.mk"
+.include "../../audio/taglib-extras/buildlink3.mk"
+.include "../../databases/mysql51-embedded/buildlink3.mk"
+.include "../../devel/qtscriptgenerator/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../lang/ruby/buildlink3.mk"
-.include "../../lang/ruby/replace.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
-.include "../../mk/oss.buildlink3.mk"
-.include "../../multimedia/kdemultimedia3/buildlink3.mk"
-.include "../../multimedia/libmp4v2/buildlink3.mk"
-.include "../../multimedia/xine-lib/buildlink3.mk"
+.include "../../meta-pkgs/kde4/kde4.mk"
+.include "../../multimedia/kdemultimedia4/buildlink3.mk"
+.include "../../security/qca2/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdebase3/buildlink3.mk"
-.include "../../x11/kdelibs3/buildlink3.mk"
+# for plasma
+.include "../../x11/kdebase-workspace4/buildlink3.mk"
+BUILDLINK_API_DEPENDS.kdelibs+= kdelibs4>=4.3.0
+.include "../../x11/kdelibs4/buildlink3.mk"
+BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.5.0
+.include "../../x11/qt4-libs/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index fd46b069d8a..e3a6d49d16a 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,1007 +1,610 @@
-@comment $NetBSD: PLIST,v 1.31 2009/06/14 17:32:01 joerg Exp $
+@comment $NetBSD: PLIST,v 1.32 2010/02/16 09:01:46 wiz Exp $
bin/amarok
-bin/amarok_daapserver.rb
-bin/amarok_libvisual
-bin/amarok_proxy.rb
-bin/amarokapp
+bin/amarok_afttagger
bin/amarokcollectionscanner
-lib/kde3/konqsidebar_universalamarok.la
-lib/kde3/libamarok_daap-mediadevice.la
-lib/kde3/libamarok_generic-mediadevice.la
-${PLIST.ipod}lib/kde3/libamarok_ipod-mediadevice.la
-lib/kde3/libamarok_massstorage-device.la
-${PLIST.libmtp}lib/kde3/libamarok_mtp-mediadevice.la
-lib/kde3/libamarok_nfs-device.la
-lib/kde3/libamarok_smb-device.la
-lib/kde3/libamarok_void-engine_plugin.la
-lib/kde3/libamarok_xine-engine.la
-lib/libamarok.la
-lib/ruby_lib/http11.rb
-lib/ruby_lib/libhttp11.la
-share/applications/kde/amarok.desktop
-share/doc/kde/HTML/da/amarok/advanced.docbook
-share/doc/kde/HTML/da/amarok/common
-share/doc/kde/HTML/da/amarok/config.docbook
-share/doc/kde/HTML/da/amarok/faq.docbook
-share/doc/kde/HTML/da/amarok/index.cache.bz2
-share/doc/kde/HTML/da/amarok/index.docbook
-share/doc/kde/HTML/da/amarok/quick.docbook
-share/doc/kde/HTML/da/amarok/requirements.docbook
-share/doc/kde/HTML/da/amarok/using.docbook
-share/doc/kde/HTML/de/amarok/add_dynamic.png
-share/doc/kde/HTML/de/amarok/advanced.docbook
-share/doc/kde/HTML/de/amarok/amarok_playlist.png
-share/doc/kde/HTML/de/amarok/analyzer.png
-share/doc/kde/HTML/de/amarok/buttons.png
-share/doc/kde/HTML/de/amarok/collection.png
-share/doc/kde/HTML/de/amarok/common
-share/doc/kde/HTML/de/amarok/config.docbook
-share/doc/kde/HTML/de/amarok/config_appearance.png
-share/doc/kde/HTML/de/amarok/config_collection.png
-share/doc/kde/HTML/de/amarok/config_engine.png
-share/doc/kde/HTML/de/amarok/config_general.png
-share/doc/kde/HTML/de/amarok/config_osd.png
-share/doc/kde/HTML/de/amarok/config_playback.png
-share/doc/kde/HTML/de/amarok/config_scrobbler.png
-share/doc/kde/HTML/de/amarok/context.png
-share/doc/kde/HTML/de/amarok/coverman.png
-share/doc/kde/HTML/de/amarok/dynamic_bar.png
-share/doc/kde/HTML/de/amarok/dynamic_settings.png
-share/doc/kde/HTML/de/amarok/equalizer.png
-share/doc/kde/HTML/de/amarok/faq.docbook
-share/doc/kde/HTML/de/amarok/file_browser.png
-share/doc/kde/HTML/de/amarok/index.cache.bz2
-share/doc/kde/HTML/de/amarok/index.docbook
-share/doc/kde/HTML/de/amarok/logo.png
-share/doc/kde/HTML/de/amarok/media_device.png
-share/doc/kde/HTML/de/amarok/menubar.png
-share/doc/kde/HTML/de/amarok/musicbrainz.png
-share/doc/kde/HTML/de/amarok/pl_browser.png
-share/doc/kde/HTML/de/amarok/pl_tip1.png
-share/doc/kde/HTML/de/amarok/play_list.png
-share/doc/kde/HTML/de/amarok/player_window.png
-share/doc/kde/HTML/de/amarok/playlist_browser.png
-share/doc/kde/HTML/de/amarok/playlist_window.png
-share/doc/kde/HTML/de/amarok/queue_manager.png
-share/doc/kde/HTML/de/amarok/quick.docbook
-share/doc/kde/HTML/de/amarok/requirements.docbook
-share/doc/kde/HTML/de/amarok/rmb_menu.png
-share/doc/kde/HTML/de/amarok/script_manager.png
-share/doc/kde/HTML/de/amarok/status_bar.png
-share/doc/kde/HTML/de/amarok/using.docbook
-share/doc/kde/HTML/de/amarok/vis_window.png
-share/doc/kde/HTML/en/amarok/add_dynamic.png
-share/doc/kde/HTML/en/amarok/advanced.docbook
-share/doc/kde/HTML/en/amarok/amarok_playlist.png
-share/doc/kde/HTML/en/amarok/analyzer.png
-share/doc/kde/HTML/en/amarok/buttons.png
-share/doc/kde/HTML/en/amarok/collection.png
-share/doc/kde/HTML/en/amarok/common
-share/doc/kde/HTML/en/amarok/config.docbook
-share/doc/kde/HTML/en/amarok/config_appearance.png
-share/doc/kde/HTML/en/amarok/config_collection.png
-share/doc/kde/HTML/en/amarok/config_engine.png
-share/doc/kde/HTML/en/amarok/config_general.png
-share/doc/kde/HTML/en/amarok/config_osd.png
-share/doc/kde/HTML/en/amarok/config_playback.png
-share/doc/kde/HTML/en/amarok/config_scrobbler.png
-share/doc/kde/HTML/en/amarok/coverman.png
-share/doc/kde/HTML/en/amarok/dynamic_bar.png
-share/doc/kde/HTML/en/amarok/dynamic_settings.png
-share/doc/kde/HTML/en/amarok/equalizer.png
-share/doc/kde/HTML/en/amarok/faq.docbook
-share/doc/kde/HTML/en/amarok/file_browser.png
-share/doc/kde/HTML/en/amarok/index.cache.bz2
-share/doc/kde/HTML/en/amarok/index.docbook
-share/doc/kde/HTML/en/amarok/logo.png
-share/doc/kde/HTML/en/amarok/media_device.png
-share/doc/kde/HTML/en/amarok/menubar.png
-share/doc/kde/HTML/en/amarok/musicbrainz.png
-share/doc/kde/HTML/en/amarok/pl_tip1.png
-share/doc/kde/HTML/en/amarok/play_list.png
-share/doc/kde/HTML/en/amarok/player_window.png
-share/doc/kde/HTML/en/amarok/playlist_browser.png
-share/doc/kde/HTML/en/amarok/playlist_window.png
-share/doc/kde/HTML/en/amarok/queue_manager.png
-share/doc/kde/HTML/en/amarok/quick.docbook
-share/doc/kde/HTML/en/amarok/requirements.docbook
-share/doc/kde/HTML/en/amarok/rmb_menu.png
-share/doc/kde/HTML/en/amarok/script_manager.png
-share/doc/kde/HTML/en/amarok/status_bar.png
-share/doc/kde/HTML/en/amarok/tab_lyrics.png
-share/doc/kde/HTML/en/amarok/tab_music.png
-share/doc/kde/HTML/en/amarok/tab_wiki.png
-share/doc/kde/HTML/en/amarok/using.docbook
-share/doc/kde/HTML/en/amarok/vis_window.png
-share/doc/kde/HTML/es/amarok/add_dynamic.png
-share/doc/kde/HTML/es/amarok/advanced.docbook
-share/doc/kde/HTML/es/amarok/amarok_playlist.png
-share/doc/kde/HTML/es/amarok/analyzer.png
-share/doc/kde/HTML/es/amarok/browser_choice.png
-share/doc/kde/HTML/es/amarok/buttons.png
-share/doc/kde/HTML/es/amarok/collection.png
-share/doc/kde/HTML/es/amarok/common
-share/doc/kde/HTML/es/amarok/config.docbook
-share/doc/kde/HTML/es/amarok/config_appearance.png
-share/doc/kde/HTML/es/amarok/config_collection.png
-share/doc/kde/HTML/es/amarok/config_engine.png
-share/doc/kde/HTML/es/amarok/config_general.png
-share/doc/kde/HTML/es/amarok/config_osd.png
-share/doc/kde/HTML/es/amarok/config_playback.png
-share/doc/kde/HTML/es/amarok/config_scrobbler.png
-share/doc/kde/HTML/es/amarok/context.png
-share/doc/kde/HTML/es/amarok/coverman.png
-share/doc/kde/HTML/es/amarok/dynamic_bar.png
-share/doc/kde/HTML/es/amarok/dynamic_mode1.png
-share/doc/kde/HTML/es/amarok/dynamic_mode2.png
-share/doc/kde/HTML/es/amarok/dynamic_settings.png
-share/doc/kde/HTML/es/amarok/equalizer.png
-share/doc/kde/HTML/es/amarok/faq.docbook
-share/doc/kde/HTML/es/amarok/file_browser.png
-share/doc/kde/HTML/es/amarok/index.cache.bz2
-share/doc/kde/HTML/es/amarok/index.docbook
-share/doc/kde/HTML/es/amarok/logo.png
-share/doc/kde/HTML/es/amarok/media_device.png
-share/doc/kde/HTML/es/amarok/menubar.png
-share/doc/kde/HTML/es/amarok/musicbrainz.png
-share/doc/kde/HTML/es/amarok/pl_browser.png
-share/doc/kde/HTML/es/amarok/pl_tip1.png
-share/doc/kde/HTML/es/amarok/play_list.png
-share/doc/kde/HTML/es/amarok/player_window.png
-share/doc/kde/HTML/es/amarok/playlist_browser.png
-share/doc/kde/HTML/es/amarok/playlist_window.png
-share/doc/kde/HTML/es/amarok/queue_manager.png
-share/doc/kde/HTML/es/amarok/quick.docbook
-share/doc/kde/HTML/es/amarok/requirements.docbook
-share/doc/kde/HTML/es/amarok/rmb_menu.png
-share/doc/kde/HTML/es/amarok/script_manager.png
-share/doc/kde/HTML/es/amarok/status_bar.png
-share/doc/kde/HTML/es/amarok/tab_lyrics.png
-share/doc/kde/HTML/es/amarok/tab_music.png
-share/doc/kde/HTML/es/amarok/tab_wiki.png
-share/doc/kde/HTML/es/amarok/using.docbook
-share/doc/kde/HTML/es/amarok/vis_window.png
-share/doc/kde/HTML/et/amarok/advanced.docbook
-share/doc/kde/HTML/et/amarok/common
-share/doc/kde/HTML/et/amarok/config.docbook
-share/doc/kde/HTML/et/amarok/develop.docbook
-share/doc/kde/HTML/et/amarok/faq.docbook
-share/doc/kde/HTML/et/amarok/feature_guide.docbook
-share/doc/kde/HTML/et/amarok/hidden.docbook
-share/doc/kde/HTML/et/amarok/howto.docbook
-share/doc/kde/HTML/et/amarok/index.cache.bz2
-share/doc/kde/HTML/et/amarok/index.docbook
-share/doc/kde/HTML/et/amarok/plugin.docbook
-share/doc/kde/HTML/et/amarok/quick.docbook
-share/doc/kde/HTML/et/amarok/requirements.docbook
-share/doc/kde/HTML/et/amarok/using.docbook
-share/doc/kde/HTML/fr/amarok/advanced.docbook
-share/doc/kde/HTML/fr/amarok/common
-share/doc/kde/HTML/fr/amarok/config.docbook
-share/doc/kde/HTML/fr/amarok/faq.docbook
-share/doc/kde/HTML/fr/amarok/feature_guide.docbook
-share/doc/kde/HTML/fr/amarok/index.cache.bz2
-share/doc/kde/HTML/fr/amarok/index.docbook
-share/doc/kde/HTML/fr/amarok/quick.docbook
-share/doc/kde/HTML/fr/amarok/requirements.docbook
-share/doc/kde/HTML/fr/amarok/using.docbook
-share/doc/kde/HTML/it/amarok/add_dynamic.png
-share/doc/kde/HTML/it/amarok/advanced.docbook
-share/doc/kde/HTML/it/amarok/amarok_playlist.png
-share/doc/kde/HTML/it/amarok/analyzer.png
-share/doc/kde/HTML/it/amarok/buttons.png
-share/doc/kde/HTML/it/amarok/collection.png
-share/doc/kde/HTML/it/amarok/common
-share/doc/kde/HTML/it/amarok/completo.png
-share/doc/kde/HTML/it/amarok/config.docbook
-share/doc/kde/HTML/it/amarok/config_appearance.png
-share/doc/kde/HTML/it/amarok/config_collection.png
-share/doc/kde/HTML/it/amarok/config_engine.png
-share/doc/kde/HTML/it/amarok/config_general.png
-share/doc/kde/HTML/it/amarok/config_osd.png
-share/doc/kde/HTML/it/amarok/config_playback.png
-share/doc/kde/HTML/it/amarok/config_scrobbler.png
-share/doc/kde/HTML/it/amarok/context.png
-share/doc/kde/HTML/it/amarok/coverman.png
-share/doc/kde/HTML/it/amarok/develop.docbook
-share/doc/kde/HTML/it/amarok/dynamic_bar.png
-share/doc/kde/HTML/it/amarok/dynamic_settings.png
-share/doc/kde/HTML/it/amarok/equalizer.png
-share/doc/kde/HTML/it/amarok/faq.docbook
-share/doc/kde/HTML/it/amarok/feature_guide.docbook
-share/doc/kde/HTML/it/amarok/file_browser.png
-share/doc/kde/HTML/it/amarok/hidden.docbook
-share/doc/kde/HTML/it/amarok/index.cache.bz2
-share/doc/kde/HTML/it/amarok/index.docbook
-share/doc/kde/HTML/it/amarok/media_device.png
-share/doc/kde/HTML/it/amarok/menubar.png
-share/doc/kde/HTML/it/amarok/pl_browser.png
-share/doc/kde/HTML/it/amarok/pl_tip1.png
-share/doc/kde/HTML/it/amarok/play_list.png
-share/doc/kde/HTML/it/amarok/player_window.png
-share/doc/kde/HTML/it/amarok/playlist_browser.png
-share/doc/kde/HTML/it/amarok/playlist_window.png
-share/doc/kde/HTML/it/amarok/plugin.docbook
-share/doc/kde/HTML/it/amarok/queue_manager.png
-share/doc/kde/HTML/it/amarok/quick.docbook
-share/doc/kde/HTML/it/amarok/requirements.docbook
-share/doc/kde/HTML/it/amarok/rmb_menu.png
-share/doc/kde/HTML/it/amarok/script_manager.png
-share/doc/kde/HTML/it/amarok/status_bar.png
-share/doc/kde/HTML/it/amarok/tab_lyrics.png
-share/doc/kde/HTML/it/amarok/tab_music.png
-share/doc/kde/HTML/it/amarok/tab_wiki.png
-share/doc/kde/HTML/it/amarok/using.docbook
-share/doc/kde/HTML/it/amarok/vis_window.png
-share/doc/kde/HTML/nl/amarok/add_dynamic.png
-share/doc/kde/HTML/nl/amarok/advanced.docbook
-share/doc/kde/HTML/nl/amarok/amarok_playlist.png
-share/doc/kde/HTML/nl/amarok/analyzer.png
-share/doc/kde/HTML/nl/amarok/buttons.png
-share/doc/kde/HTML/nl/amarok/collection.png
-share/doc/kde/HTML/nl/amarok/common
-share/doc/kde/HTML/nl/amarok/config.docbook
-share/doc/kde/HTML/nl/amarok/config_appearance.png
-share/doc/kde/HTML/nl/amarok/config_collection.png
-share/doc/kde/HTML/nl/amarok/config_engine.png
-share/doc/kde/HTML/nl/amarok/config_general.png
-share/doc/kde/HTML/nl/amarok/config_osd.png
-share/doc/kde/HTML/nl/amarok/config_playback.png
-share/doc/kde/HTML/nl/amarok/config_scrobbler.png
-share/doc/kde/HTML/nl/amarok/context.png
-share/doc/kde/HTML/nl/amarok/coverman.png
-share/doc/kde/HTML/nl/amarok/develop.docbook
-share/doc/kde/HTML/nl/amarok/dynamic_bar.png
-share/doc/kde/HTML/nl/amarok/dynamic_settings.png
-share/doc/kde/HTML/nl/amarok/equalizer.png
-share/doc/kde/HTML/nl/amarok/faq.docbook
-share/doc/kde/HTML/nl/amarok/feature_guide.docbook
-share/doc/kde/HTML/nl/amarok/file_browser.png
-share/doc/kde/HTML/nl/amarok/hidden.docbook
-share/doc/kde/HTML/nl/amarok/index.cache.bz2
-share/doc/kde/HTML/nl/amarok/index.docbook
-share/doc/kde/HTML/nl/amarok/logo.png
-share/doc/kde/HTML/nl/amarok/media_device.png
-share/doc/kde/HTML/nl/amarok/menubar.png
-share/doc/kde/HTML/nl/amarok/musicbrainz.png
-share/doc/kde/HTML/nl/amarok/pl_browser.png
-share/doc/kde/HTML/nl/amarok/pl_tip1.png
-share/doc/kde/HTML/nl/amarok/play_list.png
-share/doc/kde/HTML/nl/amarok/player_window.png
-share/doc/kde/HTML/nl/amarok/playlist_browser.png
-share/doc/kde/HTML/nl/amarok/playlist_window.png
-share/doc/kde/HTML/nl/amarok/plugin.docbook
-share/doc/kde/HTML/nl/amarok/queue_manager.png
-share/doc/kde/HTML/nl/amarok/quick.docbook
-share/doc/kde/HTML/nl/amarok/requirements.docbook
-share/doc/kde/HTML/nl/amarok/rmb_menu.png
-share/doc/kde/HTML/nl/amarok/script_manager.png
-share/doc/kde/HTML/nl/amarok/status_bar.png
-share/doc/kde/HTML/nl/amarok/tab_lyrics.png
-share/doc/kde/HTML/nl/amarok/tab_lyrics1.png
-share/doc/kde/HTML/nl/amarok/tab_music.png
-share/doc/kde/HTML/nl/amarok/tab_wiki.png
-share/doc/kde/HTML/nl/amarok/using.docbook
-share/doc/kde/HTML/nl/amarok/vis_window.png
-share/doc/kde/HTML/pl/amarok/advanced.docbook
-share/doc/kde/HTML/pl/amarok/common
-share/doc/kde/HTML/pl/amarok/config.docbook
-share/doc/kde/HTML/pl/amarok/faq.docbook
-share/doc/kde/HTML/pl/amarok/index.cache.bz2
-share/doc/kde/HTML/pl/amarok/index.docbook
-share/doc/kde/HTML/pl/amarok/quick.docbook
-share/doc/kde/HTML/pl/amarok/requirements.docbook
-share/doc/kde/HTML/pl/amarok/using.docbook
-share/doc/kde/HTML/pt/amarok/add_dynamic.png
-share/doc/kde/HTML/pt/amarok/advanced.docbook
-share/doc/kde/HTML/pt/amarok/amarok_playlist.png
-share/doc/kde/HTML/pt/amarok/analyzer.png
-share/doc/kde/HTML/pt/amarok/buttons.png
-share/doc/kde/HTML/pt/amarok/collection.png
-share/doc/kde/HTML/pt/amarok/common
-share/doc/kde/HTML/pt/amarok/config.docbook
-share/doc/kde/HTML/pt/amarok/config_appearance.png
-share/doc/kde/HTML/pt/amarok/config_collection.png
-share/doc/kde/HTML/pt/amarok/config_engine.png
-share/doc/kde/HTML/pt/amarok/config_general.png
-share/doc/kde/HTML/pt/amarok/config_osd.png
-share/doc/kde/HTML/pt/amarok/config_playback.png
-share/doc/kde/HTML/pt/amarok/config_scrobbler.png
-share/doc/kde/HTML/pt/amarok/coverman.png
-share/doc/kde/HTML/pt/amarok/develop.docbook
-share/doc/kde/HTML/pt/amarok/dynamic_bar.png
-share/doc/kde/HTML/pt/amarok/dynamic_settings.png
-share/doc/kde/HTML/pt/amarok/equalizer.png
-share/doc/kde/HTML/pt/amarok/faq.docbook
-share/doc/kde/HTML/pt/amarok/feature_guide.docbook
-share/doc/kde/HTML/pt/amarok/file_browser.png
-share/doc/kde/HTML/pt/amarok/hidden.docbook
-share/doc/kde/HTML/pt/amarok/index.cache.bz2
-share/doc/kde/HTML/pt/amarok/index.docbook
-share/doc/kde/HTML/pt/amarok/logo.png
-share/doc/kde/HTML/pt/amarok/media_device.png
-share/doc/kde/HTML/pt/amarok/menubar.png
-share/doc/kde/HTML/pt/amarok/musicbrainz.png
-share/doc/kde/HTML/pt/amarok/pl_tip1.png
-share/doc/kde/HTML/pt/amarok/play_list.png
-share/doc/kde/HTML/pt/amarok/player_window.png
-share/doc/kde/HTML/pt/amarok/playlist_browser.png
-share/doc/kde/HTML/pt/amarok/playlist_window.png
-share/doc/kde/HTML/pt/amarok/plugin.docbook
-share/doc/kde/HTML/pt/amarok/queue_manager.png
-share/doc/kde/HTML/pt/amarok/quick.docbook
-share/doc/kde/HTML/pt/amarok/requirements.docbook
-share/doc/kde/HTML/pt/amarok/rmb_menu.png
-share/doc/kde/HTML/pt/amarok/script_manager.png
-share/doc/kde/HTML/pt/amarok/status_bar.png
-share/doc/kde/HTML/pt/amarok/using.docbook
-share/doc/kde/HTML/pt/amarok/vis_window.png
-share/doc/kde/HTML/pt_BR/amarok/advanced.docbook
-share/doc/kde/HTML/pt_BR/amarok/common
-share/doc/kde/HTML/pt_BR/amarok/config.docbook
-share/doc/kde/HTML/pt_BR/amarok/faq.docbook
-share/doc/kde/HTML/pt_BR/amarok/feature_guide.docbook
-share/doc/kde/HTML/pt_BR/amarok/index.cache.bz2
-share/doc/kde/HTML/pt_BR/amarok/index.docbook
-share/doc/kde/HTML/pt_BR/amarok/quick.docbook
-share/doc/kde/HTML/pt_BR/amarok/requirements.docbook
-share/doc/kde/HTML/pt_BR/amarok/using.docbook
-share/doc/kde/HTML/ru/amarok/requirements.docbook
-share/doc/kde/HTML/sv/amarok/add_dynamic.png
-share/doc/kde/HTML/sv/amarok/advanced.docbook
-share/doc/kde/HTML/sv/amarok/amarok_playlist.png
-share/doc/kde/HTML/sv/amarok/analyzer.png
-share/doc/kde/HTML/sv/amarok/browser_choice.png
-share/doc/kde/HTML/sv/amarok/buttons.png
-share/doc/kde/HTML/sv/amarok/collection.png
-share/doc/kde/HTML/sv/amarok/common
-share/doc/kde/HTML/sv/amarok/config.docbook
-share/doc/kde/HTML/sv/amarok/config_appearance.png
-share/doc/kde/HTML/sv/amarok/config_collection.png
-share/doc/kde/HTML/sv/amarok/config_colors.png
-share/doc/kde/HTML/sv/amarok/config_engine.png
-share/doc/kde/HTML/sv/amarok/config_fonts.png
-share/doc/kde/HTML/sv/amarok/config_general.png
-share/doc/kde/HTML/sv/amarok/config_mysql.png
-share/doc/kde/HTML/sv/amarok/config_osd.png
-share/doc/kde/HTML/sv/amarok/config_playback.png
-share/doc/kde/HTML/sv/amarok/config_scrobbler.png
-share/doc/kde/HTML/sv/amarok/context.png
-share/doc/kde/HTML/sv/amarok/coverman.png
-share/doc/kde/HTML/sv/amarok/develop.docbook
-share/doc/kde/HTML/sv/amarok/dynamic_bar.png
-share/doc/kde/HTML/sv/amarok/dynamic_settings.png
-share/doc/kde/HTML/sv/amarok/equalizer.png
-share/doc/kde/HTML/sv/amarok/faq.docbook
-share/doc/kde/HTML/sv/amarok/feature_guide.docbook
-share/doc/kde/HTML/sv/amarok/file_browser.png
-share/doc/kde/HTML/sv/amarok/hidden.docbook
-share/doc/kde/HTML/sv/amarok/index.cache.bz2
-share/doc/kde/HTML/sv/amarok/index.docbook
-share/doc/kde/HTML/sv/amarok/media_device.png
-share/doc/kde/HTML/sv/amarok/menubar.png
-share/doc/kde/HTML/sv/amarok/pl_browser.png
-share/doc/kde/HTML/sv/amarok/pl_tip1.png
-share/doc/kde/HTML/sv/amarok/play_list.png
-share/doc/kde/HTML/sv/amarok/player_window.png
-share/doc/kde/HTML/sv/amarok/playlist_browser.png
-share/doc/kde/HTML/sv/amarok/playlist_window.png
-share/doc/kde/HTML/sv/amarok/plugin.docbook
-share/doc/kde/HTML/sv/amarok/queue_manager.png
-share/doc/kde/HTML/sv/amarok/quick.docbook
-share/doc/kde/HTML/sv/amarok/requirements.docbook
-share/doc/kde/HTML/sv/amarok/rmb_menu.png
-share/doc/kde/HTML/sv/amarok/script_manager.png
-share/doc/kde/HTML/sv/amarok/scripts_window.png
-share/doc/kde/HTML/sv/amarok/search.png
-share/doc/kde/HTML/sv/amarok/status_bar.png
-share/doc/kde/HTML/sv/amarok/streams.png
-share/doc/kde/HTML/sv/amarok/using.docbook
-share/doc/kde/HTML/sv/amarok/vis_window.png
-share/doc/kde/HTML/sv/amarok/welcome.png
+bin/amarokmp3tunesharmonydaemon
+bin/amarokpkg
+lib/kde4/amarok_appletscript_simple_javascript.so
+lib/kde4/amarok_collection-audiocdcollection.so
+lib/kde4/amarok_collection-daapcollection.so
+lib/kde4/amarok_collection-ipodcollection.so
+lib/kde4/amarok_collection-mtpcollection.so
+lib/kde4/amarok_collection-mysqlecollection.so
+lib/kde4/amarok_collection-mysqlservercollection.so
+lib/kde4/amarok_collection-umscollection.so
+lib/kde4/amarok_containment_vertical.so
+lib/kde4/amarok_context_applet_albums.so
+lib/kde4/amarok_context_applet_currenttrack.so
+lib/kde4/amarok_context_applet_info.so
+lib/kde4/amarok_context_applet_lyrics.so
+lib/kde4/amarok_context_applet_photos.so
+lib/kde4/amarok_context_applet_videoclip.so
+lib/kde4/amarok_context_applet_wikipedia.so
+lib/kde4/amarok_data_engine_current.so
+lib/kde4/amarok_data_engine_info.so
+lib/kde4/amarok_data_engine_lyrics.so
+lib/kde4/amarok_data_engine_photos.so
+lib/kde4/amarok_data_engine_videoclip.so
+lib/kde4/amarok_data_engine_wikipedia.so
+lib/kde4/amarok_massstorage-device.so
+lib/kde4/amarok_runnerscript_javascript.so
+lib/kde4/amarok_service_ampache.so
+lib/kde4/amarok_service_jamendo.so
+lib/kde4/amarok_service_lastfm.so
+lib/kde4/amarok_service_magnatunestore.so
+lib/kde4/amarok_service_mp3tunes.so
+lib/kde4/amarok_service_opmldirectory.so
+lib/kde4/kcm_amarok_service_ampache.so
+lib/kde4/kcm_amarok_service_lastfm.so
+lib/kde4/kcm_amarok_service_magnatunestore.so
+lib/kde4/kcm_amarok_service_mp3tunes.so
+lib/libamaroklib.so
+lib/libamaroklib.so.1
+lib/libamaroklib.so.1.0.0
+lib/libamarokocsclient.so
+lib/libamarokocsclient.so.4
+lib/libamarokocsclient.so.4.3.0
+lib/libamarokpud.so
+lib/libamarokpud.so.1
+lib/libamarokpud.so.1.0.0
+lib/strigi/strigita_audible.so
+lib/strigi/strigita_mp4.so
+share/applications/kde4/amarok.desktop
+share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
+share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
+share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
+share/dbus-1/interfaces/org.kde.amarok.Collection.xml
+share/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
share/icons/hicolor/128x128/apps/amarok.png
share/icons/hicolor/16x16/apps/amarok.png
share/icons/hicolor/22x22/apps/amarok.png
share/icons/hicolor/32x32/apps/amarok.png
share/icons/hicolor/48x48/apps/amarok.png
share/icons/hicolor/64x64/apps/amarok.png
-share/kde/apps/amarok/amarokui.rc
-share/kde/apps/amarok/data/Amarok_1.4_Welcome.ogg
-share/kde/apps/amarok/data/Cool-Streams.xml
-share/kde/apps/amarok/data/ball.png
-share/kde/apps/amarok/data/dot.png
-share/kde/apps/amarok/data/equalizer_presets.xml
-share/kde/apps/amarok/data/firstrun.m3u
-share/kde/apps/amarok/data/grid.png
-share/kde/apps/amarok/data/magnatune_logo.png
-share/kde/apps/amarok/data/wirl1.png
-share/kde/apps/amarok/data/wirl2.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/covermanager.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/dynamic.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/equalizer.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/mini_dock.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/podcast.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/podcast_new.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/random.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/visualizations.png
-share/kde/apps/amarok/icons/crystalsvg/16x16/actions/wiki.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/babelfish.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/dynamic.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/random.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/crystalsvg/22x22/actions/visualizations.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/random.png
-share/kde/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_album.png
+share/kde/apps/amarok/amarok.notifyrc
+share/kde/apps/amarok/data/DefaultPlaylistLayouts.xml
+share/kde/apps/amarok/data/InfoAppletCustomStyle.css
+share/kde/apps/amarok/data/InfoParserLoading.html
+share/kde/apps/amarok/data/WikipediaCustomStyle.css
+share/kde/apps/amarok/data/bullet.gif
+share/kde/apps/amarok/data/hover_info_template.html
+share/kde/apps/amarok/data/info_frontpage.html
+share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-high-amarok.png
+share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-low-amarok.png
+share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-medium-amarok.png
+share/kde/apps/amarok/icons/hicolor/128x128/status/audio-volume-muted-amarok.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_burn.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_circle.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_love.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_magnatune.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playcount.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_save.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_stop.png
share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/16x16/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/collection-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/collection-refresh-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/collection-rescan-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/download-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/dynamic-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/edit-redo-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/edit-undo-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/emblem-favorite-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/favorite-genres-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-artist-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-bpm-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-comment-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-composer-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-dash-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-discnumber-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-dot-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-filetype-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-genre-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-ignore-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-initial-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-slash-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-space-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-title-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-underscore-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/filename-year-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-loved-radio-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-friends-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-neighbours-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-my-tags-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-neighbour-radio-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-personal-radio-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-recommended-radio-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/lastfm-tag-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/love-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-album-cover-manager-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-album-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-album-shuffle-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-playlist-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-playlist-repeat-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-playlist-shuffle-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-random-albums-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-random-tracks-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-repeat-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-repeat-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-repeat-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-show-active-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-standard-track-progression-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-add-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-edit-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-queue-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/media-track-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/podcast-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-indicator-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-media-playback-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-multimedia-player-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/preferences-view-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-ampache-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-black-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-lastfm-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-librivox-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-magnatune-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-mp3tunes-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-opml-amarok.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/view-services-scripted-amarok.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_burn.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_circle.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_love.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_magnatune.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playcount.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_save.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_stop.png
share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/22x22/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/collection-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/collection-refresh-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/collection-rescan-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/download-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/dynamic-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/edit-redo-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/edit-undo-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/emblem-favorite-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/filename-bpm-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/internet-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/love-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-album-cover-manager-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-album-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-album-shuffle-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-playlist-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-playlist-repeat-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-playlist-shuffle-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-random-albums-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-random-tracks-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-repeat-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-repeat-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-repeat-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-show-active-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-standard-track-progression-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-add-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-edit-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-queue-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/media-track-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/podcast-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-indicator-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-media-playback-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-multimedia-player-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/preferences-view-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-black-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-lastfm-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-librivox-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-magnatune-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-mp3tunes-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-opml-amarok.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/view-services-scripted-amarok.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_burn.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_circle.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_love.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_magnatune.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playcount.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_save.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_stop.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_zoom.png
share/kde/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/32x32/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/collection-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/collection-refresh-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/collection-rescan-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/download-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/dynamic-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/edit-redo-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/edit-undo-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/emblem-favorite-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/filename-bpm-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/love-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-cover-manager-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-cover.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-shuffle-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-album-track.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-playlist-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-playlist-repeat-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-playlist-shuffle-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-random-albums-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-random-tracks-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-repeat-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-repeat-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-repeat-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-show-active-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-standard-track-progression-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-add-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-edit-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-queue-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/media-track-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/podcast-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-indicator-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-media-playback-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-multimedia-player-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/preferences-view-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-ampache-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-black-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-lastfm-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-magnatune-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-mp3tunes-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-opml-amarok.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/view-services-scripted-amarok.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_burn.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_circle.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_love.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_magnatune.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_play.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playcount.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_save.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_stop.png
share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/48x48/actions/collection.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_add_lyrics.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_add_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_album.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_artist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_back.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_burn.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_change_language.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_circle.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_clock.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_collection.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_configure.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_covermanager.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_device.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_download.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_dynamic.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_edit.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_editcopy.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_equalizer.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_external.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_fastforward.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_favourite_genres.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_files.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_files2.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_love.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_lyrics.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_magnatune.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_mostplayed.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_music.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_pause.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_play.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_clear.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast2.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_queue.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_album.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_no.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_track.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_redo.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_refresh.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_remove.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_album.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_no.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_track.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rescan.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rewind.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_save.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_scripts.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_search.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_engine.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_general.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_indicator.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_playback.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_view.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_stop.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_track.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_undo.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_visualizations.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_zoom.png
-share/kde/apps/amarok/icons/hicolor/64x64/actions/collection.png
-share/kde/apps/amarok/images/amarok_cut.png
-share/kde/apps/amarok/images/amarok_rocks.jpg
-share/kde/apps/amarok/images/b_next.png
-share/kde/apps/amarok/images/b_pause.png
-share/kde/apps/amarok/images/b_play.png
-share/kde/apps/amarok/images/b_prev.png
-share/kde/apps/amarok/images/b_stop.png
-share/kde/apps/amarok/images/back_stars_grey.png
-share/kde/apps/amarok/images/currenttrack_bar_left.png
-share/kde/apps/amarok/images/currenttrack_bar_mid.png
-share/kde/apps/amarok/images/currenttrack_bar_right.png
-share/kde/apps/amarok/images/currenttrack_pause.png
-share/kde/apps/amarok/images/currenttrack_play.png
-share/kde/apps/amarok/images/currenttrack_repeat.png
-share/kde/apps/amarok/images/currenttrack_repeat_small.png
-share/kde/apps/amarok/images/currenttrack_stop.png
-share/kde/apps/amarok/images/currenttrack_stop_small.png
-share/kde/apps/amarok/images/eq_active2.png
-share/kde/apps/amarok/images/eq_inactive2.png
-share/kde/apps/amarok/images/lastfm.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/collection-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/collection-refresh-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/collection-rescan-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/current-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/download-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/dynamic-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/edit-redo-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/edit-undo-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/emblem-favorite-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-bpm-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-comment-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-composer-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-dash-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-discnumber-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-divider.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-dot-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-filetype-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-genre-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-group-length.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-group-tracks.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-ignore-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-initial-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-last-played.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-moodbar.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-sample-rate.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-slash-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-space-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-title-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-underscore-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/filename-year-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/info-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/love-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-album-cover-manager-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-album-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-album-shuffle-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-clear-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-playlist-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-playlist-repeat-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-playlist-shuffle-off-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-random-albums-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-random-tracks-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-repeat-album-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-repeat-playlist-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-repeat-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-show-active-track-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-standard-track-progression-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-add-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-edit-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-queue-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/media-track-repeat-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/music-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/photos-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/podcast-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-indicator-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-media-playback-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-multimedia-player-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/preferences-view-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/remove-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-black-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-lastfm-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-magnatune-amarok.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/view-services-mp3tunes-amarok.png
+share/kde/apps/amarok/images/FilenameLayoutDialogHint.png
+share/kde/apps/amarok/images/amarok-videoclip-dailymotion.png
+share/kde/apps/amarok/images/amarok-videoclip-vimeo.png
+share/kde/apps/amarok/images/amarok-videoclip-youtube.png
+share/kde/apps/amarok/images/amarok_icon.svg
+share/kde/apps/amarok/images/default-theme-clean.svg
+share/kde/apps/amarok/images/emblem-ampache-scalable.svgz
+share/kde/apps/amarok/images/emblem-ampache.png
+share/kde/apps/amarok/images/emblem-default.png
+share/kde/apps/amarok/images/emblem-delicious.png
+share/kde/apps/amarok/images/emblem-digg.png
+share/kde/apps/amarok/images/emblem-facebook.png
+share/kde/apps/amarok/images/emblem-identica.png
+share/kde/apps/amarok/images/emblem-jamendo-scalable.svgz
+share/kde/apps/amarok/images/emblem-jamendo.png
+share/kde/apps/amarok/images/emblem-lastfm-scalable.svg
+share/kde/apps/amarok/images/emblem-lastfm.png
+share/kde/apps/amarok/images/emblem-linkedin.png
+share/kde/apps/amarok/images/emblem-magnatune.png
+share/kde/apps/amarok/images/emblem-mp3tunes.png
+share/kde/apps/amarok/images/emblem-myspace.png
+share/kde/apps/amarok/images/emblem-reddit.png
+share/kde/apps/amarok/images/emblem-scripted-scalable.svgz
+share/kde/apps/amarok/images/emblem-scripted.png
+share/kde/apps/amarok/images/emblem-stackoverflow.png
+share/kde/apps/amarok/images/emblem-twitter.png
+share/kde/apps/amarok/images/emblem-wikipedia.png
+share/kde/apps/amarok/images/emblem-xing.png
+share/kde/apps/amarok/images/hover_info_ampache.png
+share/kde/apps/amarok/images/hover_info_collections.png
+share/kde/apps/amarok/images/hover_info_dynamic_playlists.png
+share/kde/apps/amarok/images/hover_info_files.png
+share/kde/apps/amarok/images/hover_info_internet.png
+share/kde/apps/amarok/images/hover_info_jamendo.png
+share/kde/apps/amarok/images/hover_info_lastfm.png
+share/kde/apps/amarok/images/hover_info_magnatune.png
+share/kde/apps/amarok/images/hover_info_playlists.png
+share/kde/apps/amarok/images/hover_info_podcasts.png
+share/kde/apps/amarok/images/hover_info_user_playlists.png
+share/kde/apps/amarok/images/info_frontpage_bg.png
+share/kde/apps/amarok/images/info_frontpage_logo.png
+share/kde/apps/amarok/images/info_frontpage_shadow.png
+share/kde/apps/amarok/images/lastfm-default-cover.png
share/kde/apps/amarok/images/loading1.png
share/kde/apps/amarok/images/loading2.png
-share/kde/apps/amarok/images/menu_sidepixmap.png
-share/kde/apps/amarok/images/more_albums.png
-share/kde/apps/amarok/images/musicbrainz.png
+share/kde/apps/amarok/images/navigation_arrows.svg
share/kde/apps/amarok/images/nocover.png
-share/kde/apps/amarok/images/pl_active2.png
-share/kde/apps/amarok/images/pl_inactive2.png
-share/kde/apps/amarok/images/sbinner_stars.png
-share/kde/apps/amarok/images/shadow_albumcover.png
+share/kde/apps/amarok/images/opendesktop-22.png
+share/kde/apps/amarok/images/playlist-bookmark-16.png
+share/kde/apps/amarok/images/playlist-layouts-22.png
+share/kde/apps/amarok/images/playlist-sorting-16.png
+share/kde/apps/amarok/images/pud_items.svg
+share/kde/apps/amarok/images/service_info_loading1.png
+share/kde/apps/amarok/images/service_info_loading10.png
+share/kde/apps/amarok/images/service_info_loading11.png
+share/kde/apps/amarok/images/service_info_loading12.png
+share/kde/apps/amarok/images/service_info_loading2.png
+share/kde/apps/amarok/images/service_info_loading3.png
+share/kde/apps/amarok/images/service_info_loading4.png
+share/kde/apps/amarok/images/service_info_loading5.png
+share/kde/apps/amarok/images/service_info_loading6.png
+share/kde/apps/amarok/images/service_info_loading7.png
+share/kde/apps/amarok/images/service_info_loading8.png
+share/kde/apps/amarok/images/service_info_loading9.png
share/kde/apps/amarok/images/smallstar.png
share/kde/apps/amarok/images/splash_screen.jpg
share/kde/apps/amarok/images/star.png
-share/kde/apps/amarok/images/time_minus.png
-share/kde/apps/amarok/images/time_plus.png
-share/kde/apps/amarok/images/vol_speaker.png
-share/kde/apps/amarok/images/volumeslider-gradient.png
-share/kde/apps/amarok/images/volumeslider-handle.png
-share/kde/apps/amarok/images/volumeslider-handle_glow.png
-share/kde/apps/amarok/images/volumeslider-inset.png
-share/kde/apps/amarok/images/wizard_compact.png
-share/kde/apps/amarok/images/wizard_xmms.png
-share/kde/apps/amarok/images/xine_logo.png
-share/kde/apps/amarok/ruby_lib/codes.rb
-share/kde/apps/amarok/ruby_lib/gem_plugin.rb
-share/kde/apps/amarok/ruby_lib/gemconfigure.rb
-share/kde/apps/amarok/ruby_lib/mongrel.rb
-share/kde/apps/amarok/ruby_lib/mongrel/cgi.rb
-share/kde/apps/amarok/ruby_lib/mongrel/command.rb
-share/kde/apps/amarok/ruby_lib/mongrel/configurator.rb
-share/kde/apps/amarok/ruby_lib/mongrel/debug.rb
-share/kde/apps/amarok/ruby_lib/mongrel/handlers.rb
-share/kde/apps/amarok/ruby_lib/mongrel/init.rb
-share/kde/apps/amarok/ruby_lib/mongrel/mime_types.yml
-share/kde/apps/amarok/ruby_lib/mongrel/stats.rb
-share/kde/apps/amarok/ruby_lib/mongrel/tcphack.rb
-share/kde/apps/amarok/ruby_lib/rbconfig/datadir.rb
-share/kde/apps/amarok/ruby_lib/rubygems.rb
-share/kde/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
-share/kde/apps/amarok/ruby_lib/rubygems/builder.rb
-share/kde/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
-share/kde/apps/amarok/ruby_lib/rubygems/command.rb
-share/kde/apps/amarok/ruby_lib/rubygems/config_file.rb
-share/kde/apps/amarok/ruby_lib/rubygems/custom_require.rb
-share/kde/apps/amarok/ruby_lib/rubygems/dependency_list.rb
-share/kde/apps/amarok/ruby_lib/rubygems/doc_manager.rb
-share/kde/apps/amarok/ruby_lib/rubygems/format.rb
-share/kde/apps/amarok/ruby_lib/rubygems/gem_commands.rb
-share/kde/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
-share/kde/apps/amarok/ruby_lib/rubygems/gem_runner.rb
-share/kde/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
-share/kde/apps/amarok/ruby_lib/rubygems/installer.rb
-share/kde/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
-share/kde/apps/amarok/ruby_lib/rubygems/old_format.rb
-share/kde/apps/amarok/ruby_lib/rubygems/open-uri.rb
-share/kde/apps/amarok/ruby_lib/rubygems/package.rb
-share/kde/apps/amarok/ruby_lib/rubygems/remote_installer.rb
-share/kde/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
-share/kde/apps/amarok/ruby_lib/rubygems/security.rb
-share/kde/apps/amarok/ruby_lib/rubygems/source_index.rb
-share/kde/apps/amarok/ruby_lib/rubygems/specification.rb
-share/kde/apps/amarok/ruby_lib/rubygems/timer.rb
-share/kde/apps/amarok/ruby_lib/rubygems/user_interaction.rb
-share/kde/apps/amarok/ruby_lib/rubygems/validator.rb
-share/kde/apps/amarok/ruby_lib/rubygems/version.rb
-share/kde/apps/amarok/scripts/common/Publisher.py
-share/kde/apps/amarok/scripts/common/Zeroconf.py
-share/kde/apps/amarok/scripts/lyrics_astraweb/COPYING
-share/kde/apps/amarok/scripts/lyrics_astraweb/README
-share/kde/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-share/kde/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-share/kde/apps/amarok/scripts/lyrics_lyrc/COPYING
-share/kde/apps/amarok/scripts/lyrics_lyrc/README
-share/kde/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-share/kde/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
-share/kde/apps/amarok/scripts/playlist2html/Playlist.py
-share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.py
-share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.spec
-share/kde/apps/amarok/scripts/playlist2html/README
-share/kde/apps/amarok/scripts/playlist2html/playlist2html.py
-share/kde/apps/amarok/scripts/playlist2html/playlist2html.spec
-share/kde/apps/amarok/scripts/ruby_debug/debug.rb
-share/kde/apps/amarok/scripts/score_default/COPYING
-share/kde/apps/amarok/scripts/score_default/README
-share/kde/apps/amarok/scripts/score_default/score_default.rb
-share/kde/apps/amarok/scripts/score_default/score_default.spec
-share/kde/apps/amarok/scripts/score_impulsive/COPYING
-share/kde/apps/amarok/scripts/score_impulsive/README
-share/kde/apps/amarok/scripts/score_impulsive/score_impulsive.rb
-share/kde/apps/amarok/scripts/score_impulsive/score_impulsive.spec
-share/kde/apps/amarok/scripts/templates/amarok.rb
-share/kde/apps/amarok/scripts/templates/python_qt_template.py
-share/kde/apps/amarok/scripts/templates/ruby_qt_template.rb
-share/kde/apps/amarok/scripts/webcontrol/Globals.py
-share/kde/apps/amarok/scripts/webcontrol/Playlist.py
-share/kde/apps/amarok/scripts/webcontrol/README
-share/kde/apps/amarok/scripts/webcontrol/RequestHandler.py
-share/kde/apps/amarok/scripts/webcontrol/WebControl.py
-share/kde/apps/amarok/scripts/webcontrol/WebControl.spec
-share/kde/apps/amarok/scripts/webcontrol/WebPublisher.py
-share/kde/apps/amarok/scripts/webcontrol/amarok_cut.png
-share/kde/apps/amarok/scripts/webcontrol/controlbackground.png
-share/kde/apps/amarok/scripts/webcontrol/main.css
-share/kde/apps/amarok/scripts/webcontrol/main.js
-share/kde/apps/amarok/scripts/webcontrol/player_end.png
-share/kde/apps/amarok/scripts/webcontrol/player_pause.png
-share/kde/apps/amarok/scripts/webcontrol/player_play.png
-share/kde/apps/amarok/scripts/webcontrol/player_start.png
-share/kde/apps/amarok/scripts/webcontrol/player_stop.png
-share/kde/apps/amarok/scripts/webcontrol/smallstar.png
-share/kde/apps/amarok/scripts/webcontrol/star.png
-share/kde/apps/amarok/scripts/webcontrol/template.thtml
-share/kde/apps/amarok/scripts/webcontrol/vol_speaker.png
-share/kde/apps/amarok/themes/example/stylesheet.css
-share/kde/apps/amarok/themes/reinhardt/images/background.png
-share/kde/apps/amarok/themes/reinhardt/images/transparency.png
-share/kde/apps/amarok/themes/reinhardt/stylesheet.css
-share/kde/apps/konqsidebartng/add/amarok.desktop
-share/kde/apps/konqsidebartng/entries/amarok.desktop
-share/kde/apps/konqsidebartng/kicker_entries/amarok.desktop
-share/kde/apps/konqueror/servicemenus/amarok_addaspodcast.desktop
-share/kde/apps/konqueror/servicemenus/amarok_append.desktop
-share/kde/apps/konqueror/servicemenus/amarok_play_audiocd.desktop
-share/kde/apps/profiles/amarok.profile.xml
-share/kde/config.kcfg/amarok.kcfg
-share/kde/config.kcfg/xinecfg.kcfg
-share/kde/config/amarokrc
-share/kde/services/amarok_daap-mediadevice.desktop
-share/kde/services/amarok_generic-mediadevice.desktop
-${PLIST.ipod}share/kde/services/amarok_ipod-mediadevice.desktop
-share/kde/services/amarok_massstorage-device.desktop
-${PLIST.libmtp}share/kde/services/amarok_mtp-mediadevice.desktop
-share/kde/services/amarok_nfs-device.desktop
-share/kde/services/amarok_smb-device.desktop
-share/kde/services/amarok_void-engine_plugin.desktop
-share/kde/services/amarok_xine-engine.desktop
-share/kde/services/amarokitpc.protocol
-share/kde/services/amaroklastfm.protocol
-share/kde/services/amarokpcast.protocol
-share/kde/servicetypes/amarok_codecinstall.desktop
-share/kde/servicetypes/amarok_plugin.desktop
-share/locale/af/LC_MESSAGES/amarok.mo
-share/locale/ar/LC_MESSAGES/amarok.mo
-share/locale/az/LC_MESSAGES/amarok.mo
-share/locale/be/LC_MESSAGES/amarok.mo
+share/kde/apps/amarok/images/volume_icon.png
+share/kde/apps/amarok/images/volume_muted_icon.png
+share/kde/apps/amarok/images/web_applet_background.svg
+share/kde/apps/amarok/scripts/librivox_service/COPYING
+share/kde/apps/amarok/scripts/librivox_service/LibrivoxEmblem.png
+share/kde/apps/amarok/scripts/librivox_service/LibrivoxIcon.png
+share/kde/apps/amarok/scripts/librivox_service/LibrivoxLogo.png
+share/kde/apps/amarok/scripts/librivox_service/LibrivoxScalableEmblem.svgz
+share/kde/apps/amarok/scripts/librivox_service/LibrivoxService.html
+share/kde/apps/amarok/scripts/librivox_service/README
+share/kde/apps/amarok/scripts/librivox_service/audio_book128.png
+share/kde/apps/amarok/scripts/librivox_service/main.js
+share/kde/apps/amarok/scripts/librivox_service/script.spec
+share/kde/apps/amarok/scripts/lyrics_lyricwiki/main.js
+share/kde/apps/amarok/scripts/lyrics_lyricwiki/script.spec
+share/kde/apps/amarok/scripts/radio_station_service/main.js
+share/kde/apps/amarok/scripts/radio_station_service/script.spec
+share/kde/apps/amarok/scripts/script_console/main.js
+share/kde/apps/amarok/scripts/script_console/script.spec
+share/kde/apps/desktoptheme/Amarok-Mockup/colors
+share/kde/apps/desktoptheme/Amarok-Mockup/widgets/background.svg
+share/kde/apps/desktoptheme/Amarok-Mockup/widgets/text-background.svgz
+share/kde/apps/desktoptheme/default/widgets/amarok-albums.svg
+share/kde/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
+share/kde/apps/desktoptheme/default/widgets/amarok-info-applet.svg
+share/kde/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
+share/kde/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
+share/kde/apps/solid/actions/amarok-play-audiocd.desktop
+share/kde/config.kcfg/amarokconfig.kcfg
+share/kde/config/amarok.knsrc
+share/kde/config/amarok_homerc
+share/kde/config/amarokapplets.knsrc
+share/kde4/services/ServiceMenus/amarok_append.desktop
+share/kde4/services/amarok-containment-vertical.desktop
+share/kde4/services/amarok-context-applet-albums.desktop
+share/kde4/services/amarok-context-applet-currenttrack.desktop
+share/kde4/services/amarok-context-applet-info.desktop
+share/kde4/services/amarok-context-applet-lyrics.desktop
+share/kde4/services/amarok-context-applet-photos.desktop
+share/kde4/services/amarok-context-applet-videoclip.desktop
+share/kde4/services/amarok-context-applet-wikipedia.desktop
+share/kde4/services/amarok-data-engine-current.desktop
+share/kde4/services/amarok-data-engine-info.desktop
+share/kde4/services/amarok-data-engine-lyrics.desktop
+share/kde4/services/amarok-data-engine-photos.desktop
+share/kde4/services/amarok-data-engine-videoclip.desktop
+share/kde4/services/amarok-data-engine-wikipedia.desktop
+share/kde4/services/amarok-scriptengine-applet-simple-javascript.desktop
+share/kde4/services/amarok-scriptengine-runner-javascript.desktop
+share/kde4/services/amarok.protocol
+share/kde4/services/amarok_collection-audiocdcollection.desktop
+share/kde4/services/amarok_collection-daapcollection.desktop
+share/kde4/services/amarok_collection-ipodcollection.desktop
+share/kde4/services/amarok_collection-mtpcollection.desktop
+share/kde4/services/amarok_collection-mysqlecollection.desktop
+share/kde4/services/amarok_collection-mysqlservercollection.desktop
+share/kde4/services/amarok_collection-umscollection.desktop
+share/kde4/services/amarok_massstorage-device.desktop
+share/kde4/services/amarok_service_ampache.desktop
+share/kde4/services/amarok_service_ampache_config.desktop
+share/kde4/services/amarok_service_jamendo.desktop
+share/kde4/services/amarok_service_lastfm.desktop
+share/kde4/services/amarok_service_lastfm_config.desktop
+share/kde4/services/amarok_service_magnatunestore.desktop
+share/kde4/services/amarok_service_magnatunestore_config.desktop
+share/kde4/services/amarok_service_mp3tunes.desktop
+share/kde4/services/amarok_service_mp3tunes_config.desktop
+share/kde4/services/amarok_service_opmldirectory.desktop
+share/kde4/services/amaroklastfm.protocol
+share/kde4/servicetypes/amarok_codecinstall.desktop
+share/kde4/servicetypes/amarok_context_applet.desktop
+share/kde4/servicetypes/amarok_data_engine.desktop
+share/kde4/servicetypes/amarok_plugin.desktop
share/locale/bg/LC_MESSAGES/amarok.mo
-share/locale/bn/LC_MESSAGES/amarok.mo
-share/locale/br/LC_MESSAGES/amarok.mo
+share/locale/bg/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/bg/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/bg/LC_MESSAGES/amarokpkg.mo
share/locale/ca/LC_MESSAGES/amarok.mo
+share/locale/ca/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ca/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ca/LC_MESSAGES/amarokpkg.mo
share/locale/cs/LC_MESSAGES/amarok.mo
-share/locale/cy/LC_MESSAGES/amarok.mo
+share/locale/cs/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/cs/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/cs/LC_MESSAGES/amarokpkg.mo
share/locale/da/LC_MESSAGES/amarok.mo
+share/locale/da/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/da/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/da/LC_MESSAGES/amarokpkg.mo
share/locale/de/LC_MESSAGES/amarok.mo
+share/locale/de/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/de/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/de/LC_MESSAGES/amarokpkg.mo
share/locale/el/LC_MESSAGES/amarok.mo
share/locale/en_GB/LC_MESSAGES/amarok.mo
-share/locale/eo/LC_MESSAGES/amarok.mo
+share/locale/en_GB/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/en_GB/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/en_GB/LC_MESSAGES/amarokpkg.mo
share/locale/es/LC_MESSAGES/amarok.mo
+share/locale/es/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/es/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/es/LC_MESSAGES/amarokpkg.mo
share/locale/et/LC_MESSAGES/amarok.mo
-share/locale/eu/LC_MESSAGES/amarok.mo
-share/locale/fa/LC_MESSAGES/amarok.mo
+share/locale/et/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/et/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/et/LC_MESSAGES/amarokpkg.mo
share/locale/fi/LC_MESSAGES/amarok.mo
share/locale/fr/LC_MESSAGES/amarok.mo
-share/locale/ga/LC_MESSAGES/amarok.mo
-share/locale/gl/LC_MESSAGES/amarok.mo
-share/locale/he/LC_MESSAGES/amarok.mo
-share/locale/hi/LC_MESSAGES/amarok.mo
+share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/fr/LC_MESSAGES/amarokpkg.mo
share/locale/hu/LC_MESSAGES/amarok.mo
-share/locale/id/LC_MESSAGES/amarok.mo
-share/locale/is/LC_MESSAGES/amarok.mo
+share/locale/hu/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/hu/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/hu/LC_MESSAGES/amarokpkg.mo
share/locale/it/LC_MESSAGES/amarok.mo
-share/locale/ja/LC_MESSAGES/amarok.mo
-share/locale/ka/LC_MESSAGES/amarok.mo
+share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/it/LC_MESSAGES/amarokpkg.mo
share/locale/km/LC_MESSAGES/amarok.mo
-share/locale/ko/LC_MESSAGES/amarok.mo
-share/locale/ku/LC_MESSAGES/amarok.mo
-share/locale/lo/LC_MESSAGES/amarok.mo
-share/locale/lt/LC_MESSAGES/amarok.mo
-share/locale/mk/LC_MESSAGES/amarok.mo
-share/locale/ms/LC_MESSAGES/amarok.mo
+share/locale/km/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/km/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/km/LC_MESSAGES/amarokpkg.mo
+share/locale/lv/LC_MESSAGES/amarok.mo
+share/locale/lv/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/lv/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/lv/LC_MESSAGES/amarokpkg.mo
share/locale/nb/LC_MESSAGES/amarok.mo
+share/locale/nb/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/nb/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/nb/LC_MESSAGES/amarokpkg.mo
share/locale/nds/LC_MESSAGES/amarok.mo
-share/locale/ne/LC_MESSAGES/amarok.mo
+share/locale/nds/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/nds/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/nds/LC_MESSAGES/amarokpkg.mo
share/locale/nl/LC_MESSAGES/amarok.mo
-share/locale/nn/LC_MESSAGES/amarok.mo
+share/locale/nl/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/nl/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/nl/LC_MESSAGES/amarokpkg.mo
share/locale/pa/LC_MESSAGES/amarok.mo
+share/locale/pa/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/pa/LC_MESSAGES/amarokpkg.mo
share/locale/pl/LC_MESSAGES/amarok.mo
+share/locale/pl/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/pl/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/pl/LC_MESSAGES/amarokpkg.mo
share/locale/pt/LC_MESSAGES/amarok.mo
+share/locale/pt/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/pt/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/pt/LC_MESSAGES/amarokpkg.mo
share/locale/pt_BR/LC_MESSAGES/amarok.mo
-share/locale/ro/LC_MESSAGES/amarok.mo
+share/locale/pt_BR/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/pt_BR/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/pt_BR/LC_MESSAGES/amarokpkg.mo
share/locale/ru/LC_MESSAGES/amarok.mo
-share/locale/rw/LC_MESSAGES/amarok.mo
-share/locale/se/LC_MESSAGES/amarok.mo
-share/locale/sk/LC_MESSAGES/amarok.mo
+share/locale/ru/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/ru/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/ru/LC_MESSAGES/amarokpkg.mo
share/locale/sl/LC_MESSAGES/amarok.mo
-share/locale/sq/LC_MESSAGES/amarok.mo
+share/locale/sl/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/sl/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sl/LC_MESSAGES/amarokpkg.mo
share/locale/sr/LC_MESSAGES/amarok.mo
-share/locale/sr@Latn/LC_MESSAGES/amarok.mo
-share/locale/ss/LC_MESSAGES/amarok.mo
+share/locale/sr/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/sr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sr/LC_MESSAGES/amarokpkg.mo
+share/locale/sr@latin/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/sv/LC_MESSAGES/amarok.mo
-share/locale/ta/LC_MESSAGES/amarok.mo
-share/locale/tg/LC_MESSAGES/amarok.mo
-share/locale/th/LC_MESSAGES/amarok.mo
+share/locale/sv/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/sv/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/sv/LC_MESSAGES/amarokpkg.mo
share/locale/tr/LC_MESSAGES/amarok.mo
+share/locale/tr/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/tr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/tr/LC_MESSAGES/amarokpkg.mo
share/locale/uk/LC_MESSAGES/amarok.mo
-share/locale/uz/LC_MESSAGES/amarok.mo
-share/locale/uz@cyrillic/LC_MESSAGES/amarok.mo
+share/locale/uk/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/uk/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/uk/LC_MESSAGES/amarokpkg.mo
+share/locale/wa/LC_MESSAGES/amarok.mo
+share/locale/wa/LC_MESSAGES/amarokcollectionscanner_qt.mo
share/locale/zh_CN/LC_MESSAGES/amarok.mo
-share/locale/zh_TW/LC_MESSAGES/amarok.mo
+share/locale/zh_CN/LC_MESSAGES/amarok_scriptengine_qscript.mo
+share/locale/zh_CN/LC_MESSAGES/amarokcollectionscanner_qt.mo
+share/locale/zh_CN/LC_MESSAGES/amarokpkg.mo
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 21cdd6cd353..987eff29916 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.37 2009/02/15 11:22:48 wiz Exp $
+$NetBSD: distinfo,v 1.38 2010/02/16 09:01:46 wiz Exp $
-SHA1 (amarok-1.4.10.tar.bz2) = cb0bebe99c6f4dc1b01601f2f3aee3a86da08fbd
-RMD160 (amarok-1.4.10.tar.bz2) = f86c71dd0459e0cf1ff586cd6de240ca6501cf62
-Size (amarok-1.4.10.tar.bz2) = 12812583 bytes
-SHA1 (patch-aa) = 53316f334f45a8a4780ae71061d528374a75cb5a
-SHA1 (patch-ab) = 91097c1d901fb66c5c8e593005c462b1874f50bf
-SHA1 (patch-ac) = ea6900aafc3cd99069ac59929ae14296662d095f
-SHA1 (patch-ad) = eea8105897ce4cd9d4a086430ec0588125b3517b
+SHA1 (amarok-2.2.2.tar.bz2) = 2075299b856477cf55cba8ba983ea25a93dc139b
+RMD160 (amarok-2.2.2.tar.bz2) = 0782c4b032d318179bd8bb91353f8e33772d2912
+Size (amarok-2.2.2.tar.bz2) = 8788107 bytes
+SHA1 (patch-aa) = 524a9563db17cbf5e234f2ebe261820326e5d30d
+SHA1 (patch-ab) = 62beea32f17ce6e138702e740d089c6257ddfced
+SHA1 (patch-ac) = c8c111d0927efe56a07ce89b2ec788a6364257aa
diff --git a/audio/amarok/options.mk b/audio/amarok/options.mk
index f394d6d20de..0375f8e6a82 100644
--- a/audio/amarok/options.mk
+++ b/audio/amarok/options.mk
@@ -1,30 +1,44 @@
-# $NetBSD: options.mk,v 1.6 2008/09/22 05:35:20 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2010/02/16 09:01:46 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.amarok
-PKG_SUPPORTED_OPTIONS= libgpod libmtp mysql pgsql
+PKG_SUPPORTED_OPTIONS= libgpod libmp4v2 libmtp libvisual mp3tunes
+PKG_SUGGESTED_OPTIONS= libgpod libmp4v2 libmtp libvisual mp3tunes
.include "../../mk/bsd.options.mk"
-PLIST_VARS+= ipod libmtp
-
.if !empty(PKG_OPTIONS:Mlibgpod)
-PLIST.ipod= yes
-CONFIGURE_ARGS+= --enable-libgpod
-BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.4.2
-. include "../../audio/libgpod/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgpod+= libgpod>=0.6.0nb1
+.include "../../audio/libgpod/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+# libifp is currently not supported
+#.if !empty(PKG_OPTIONS:Mlibifp)
+#.include "../../audio/libifp/buildlink3.mk"
+#.endif
+
+.if !empty(PKG_OPTIONS:Mlibmp4v2)
+.include "../../multimedia/libmp4v2/buildlink3.mk"
.endif
.if !empty(PKG_OPTIONS:Mlibmtp)
-PLIST.libmtp= yes
-. include "../../devel/libmtp/buildlink3.mk"
+.include "../../devel/libmtp/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+= --enable-mysql
-. include "../../mk/mysql.buildlink3.mk"
+# libnjb is currently not supported
+#.if !empty(PKG_OPTIONS:Mlibnjb)
+#.include "../../devel/libnjb/buildlink3.mk"
+#.endif
+
+.if !empty(PKG_OPTIONS:Mlibvisual)
+.include "../../audio/libvisual/buildlink3.mk"
.endif
-.if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+= --enable-postgresql
-. include "../../mk/pgsql.buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mmp3tunes)
+.include "../../chat/loudmouth/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
+# XXX: make sure qt4-libs have glib enabled
.endif
diff --git a/audio/amarok/patches/patch-aa b/audio/amarok/patches/patch-aa
index 3d513f26024..f82c07575cc 100644
--- a/audio/amarok/patches/patch-aa
+++ b/audio/amarok/patches/patch-aa
@@ -1,46 +1,369 @@
-$NetBSD: patch-aa,v 1.14 2008/09/22 05:35:20 wiz Exp $
+$NetBSD: patch-aa,v 1.15 2010/02/16 09:01:46 wiz Exp $
---- amarok/src/mediadevice/mtp/mtpmediadevice.cpp.orig 2008-08-13 23:21:51.000000000 +0200
-+++ amarok/src/mediadevice/mtp/mtpmediadevice.cpp
-@@ -293,12 +293,13 @@ MediaItem
- parent_id = getDefaultParentId();
+post-2.2.2 patch from upstream
+
+--- src/collection/sqlcollection/ScanResultProcessor.cpp.orig 2010-01-06 22:19:46.000000000 +0000
++++ src/collection/sqlcollection/ScanResultProcessor.cpp
+@@ -42,19 +42,59 @@ ScanResultProcessor::ScanResultProcessor
+ ScanResultProcessor::~ScanResultProcessor()
+ {
+ //everything has a URL, so enough to just delete from here
++ QSet<QStringList*> currSet; //prevent double deletes
+ foreach( QStringList *list, m_urlsHashByUid )
+- delete list;
++ {
++ if( list )
++ {
++ if( !currSet.contains( list ) )
++ {
++ delete list;
++ currSet.insert( list );
++ }
++ }
++ else
++ debug() << "GAAH! Tried to double-delete a value in m_urlsHashByUid";
++ }
+ foreach( QLinkedList<QStringList*> *list, m_albumsHashByName )
+ {
+- foreach( QStringList *slist, *list )
+- delete slist;
+- delete list;
++ if( list )
++ {
++ foreach( QStringList *slist, *list )
++ {
++ if( slist )
++ {
++ if( !currSet.contains( slist ) )
++ {
++ delete slist;
++ currSet.insert( slist );
++ }
++ else
++ debug() << "GAAH! Tried to double-delete a value in m_albumsHashByName";
++ }
++ }
++ delete list;
++ }
+ }
+ foreach( QLinkedList<QStringList*> *list, m_tracksHashByAlbum )
+ {
+- foreach( QStringList *slist, *list )
+- delete slist;
+- delete list;
++ if( list )
++ {
++ foreach( QStringList *slist, *list )
++ {
++ if( slist )
++ {
++ if( !currSet.contains( slist ) )
++ {
++ delete slist;
++ currSet.insert( slist );
++ }
++ else
++ debug() << "GAAH! Tried to double-delete a value in m_tracksHashByAlbum";
++ }
++ }
++ delete list;
++ }
}
- debug() << "Parent id : " << parent_id << endl;
-+ trackmeta->parent_id = parent_id;
+ }
- m_critical_mutex.lock();
- debug() << "Sending track... " << bundle.url().path().utf8() << endl;
- int ret = LIBMTP_Send_Track_From_File(
- m_device, bundle.url().path().utf8(), trackmeta,
-- progressCallback, this, parent_id
-+ progressCallback, this
- );
- m_critical_mutex.unlock();
+@@ -67,11 +107,11 @@ ScanResultProcessor::setScanType( ScanTy
+ void
+ ScanResultProcessor::addDirectory( const QString &dir, uint mtime )
+ {
+- DEBUG_BLOCK
+- debug() << "SRP::addDirectory on " << dir << " with mtime " << mtime;
++ //DEBUG_BLOCK
++ //debug() << "SRP::addDirectory on " << dir << " with mtime " << mtime;
+ if( dir.isEmpty() )
+ {
+- debug() << "got directory with no path from the scanner, not adding";
++ //debug() << "got directory with no path from the scanner, not adding";
+ return;
+ }
+ setupDatabase();
+@@ -254,7 +294,7 @@ ScanResultProcessor::rollback()
+ void
+ ScanResultProcessor::processDirectory( const QList<QVariantMap > &data )
+ {
+-// DEBUG_BLOCK
++ //DEBUG_BLOCK
+ setupDatabase();
+ //using the following heuristics:
+ //if more than one album is in the dir, use the artist of each track as albumartist
+@@ -274,24 +314,54 @@ ScanResultProcessor::processDirectory( c
+ if( row.value( Field::ALBUM ).toString() != album )
+ multipleAlbums = true;
+ }
++
+ if( multipleAlbums || album.isEmpty() || artists.size() == 1 )
+ {
+ foreach( const QVariantMap &row, data )
+ {
+- int artist = genericId( &m_artists, row.value( Field::ARTIST ).toString(), &m_nextArtistNum );
+- addTrack( row, artist );
++ QString uid = row.value( Field::UNIQUEID ).toString();
++ if( m_uidsSeenThisScan.contains( uid ) )
++ {
++ QString originalLocation = ( ( m_urlsHashByUid.contains( uid ) &&
++ m_urlsHashByUid[uid] != 0 ) ?
++ MountPointManager::instance()->getAbsolutePath( m_urlsHashByUid[uid]->at( 1 ).toInt(), m_urlsHashByUid[uid]->at( 2 ) ) : "(unknown)" );
++ debug() << "Skipping file with uniqueid " << uid << " as it was already seen this scan," <<
++ "file is at " << row.value( Field::URL ).toString() << ", original file is at " << originalLocation;
++ }
++ else
++ {
++ int artist = genericId( &m_artists, row.value( Field::ARTIST ).toString(), &m_nextArtistNum );
++ //debug() << "artist found = " << artist;
++ addTrack( row, artist );
++ m_uidsSeenThisScan.insert( uid );
++ }
+ }
+ }
+ else
+ {
+ QString albumArtist = findAlbumArtist( artists, data.count() );
++ //debug() << "albumArtist found = " << albumArtist;
+ //an empty string means that no albumartist was found
+ int artist = albumArtist.isEmpty() ? 0 : genericId( &m_artists, albumArtist, &m_nextArtistNum );
++ //debug() << "artist found = " << artist;
-@@ -529,7 +530,7 @@ LIBMTP_album_t
- for( MtpMediaItem *it = dynamic_cast<MtpMediaItem*>(items->first()); it; it = dynamic_cast<MtpMediaItem*>(items->next()) )
- album_object->tracks[i++] = it->track()->id();
- album_object->no_tracks = items->count();
-- ret = LIBMTP_Create_New_Album( m_device, album_object, 0 );
-+ ret = LIBMTP_Create_New_Album( m_device, album_object );
- if( ret != 0 )
+ //debug() << "albumartist " << albumArtist << "for artists" << artists;
+ foreach( const QVariantMap &row, data )
{
- debug() << "creating album failed : " << ret << endl;
-@@ -608,7 +609,7 @@ MtpMediaDevice::createFolder( const char
+- addTrack( row, artist );
++ QString uid = row.value( Field::UNIQUEID ).toString();
++ if( m_uidsSeenThisScan.contains( uid ) )
++ {
++ QString originalLocation = ( ( m_urlsHashByUid.contains( uid ) &&
++ m_urlsHashByUid[uid] != 0 ) ?
++ MountPointManager::instance()->getAbsolutePath( m_urlsHashByUid[uid]->at( 1 ).toInt(), m_urlsHashByUid[uid]->at( 2 ) ) : "(unknown)" );
++ debug() << "Skipping file with uniqueid " << uid << " as it was already seen this scan," <<
++ "file is at " << row.value( Field::URL ).toString() << ", original file is at " << originalLocation;
++ }
++ else
++ {
++ addTrack( row, artist );
++ m_uidsSeenThisScan.insert( uid );
++ }
+ }
+ }
+ }
+@@ -299,6 +369,7 @@ ScanResultProcessor::processDirectory( c
+ QString
+ ScanResultProcessor::findAlbumArtist( const QSet<QString> &artists, int trackCount ) const
{
- debug() << "Creating new folder '" << name << "' as a child of "<< parent_id << endl;
- char *name_copy = qstrdup( name );
-- uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id );
-+ uint32_t new_folder_id = LIBMTP_Create_Folder( m_device, name_copy, parent_id, 0 );
- delete(name_copy);
- debug() << "New folder ID: " << new_folder_id << endl;
- if( new_folder_id == 0 )
-@@ -913,7 +914,7 @@ MtpMediaDevice::playlistFromItem( MtpMed
- if( item->playlist()->id() == 0 )
- {
- debug() << "creating new playlist : " << metadata->name << endl;
-- int ret = LIBMTP_Create_New_Playlist( m_device, metadata, 0 );
-+ int ret = LIBMTP_Create_New_Playlist( m_device, metadata );
- if( ret == 0 )
++ //DEBUG_BLOCK
+ QMap<QString, int> artistCount;
+ bool featuring;
+ QStringList trackArtists;
+@@ -371,6 +442,7 @@ void
+ ScanResultProcessor::addTrack( const QVariantMap &trackData, int albumArtistId )
+ {
+ //DEBUG_BLOCK
++ //debug() << "albumArtistId = " << albumArtistId;
+ //amarok 1 stored all tracks of a compilation in different directories.
+ //when using its "Organize Collection" feature
+ //try to detect these cases
+@@ -419,7 +491,15 @@ ScanResultProcessor::addTrack( const QVa
+
+ //urlId will take care of the urls table part of AFT
+ int url = urlId( path, uid );
+-
++/*
++ foreach( QString key, m_urlsHashByUid.keys() )
++ debug() << "Key: " << key << ", list: " << *m_urlsHashByUid[key];
++ foreach( int key, m_urlsHashById.keys() )
++ debug() << "Key: " << key << ", list: " << *m_urlsHashById[key];
++ typedef QPair<int, QString> blahType; //QFOREACH is stupid when it comes to QPairs
++ foreach( blahType key, m_urlsHashByLocation.keys() )
++ debug() << "Key: " << key << ", list: " << *m_urlsHashByLocation[key];
++*/
+ QStringList *trackList = new QStringList();
+ int id = m_nextTrackNum;
+ //debug() << "Appending new track number with tracknum: " << id;
+@@ -470,7 +550,7 @@ ScanResultProcessor::addTrack( const QVa
+ //insert into hashes
+ if( m_tracksHashByUrl.contains( url ) && m_tracksHashByUrl[url] != 0 )
+ {
+- //debug() << "m_tracksHashByUrl contains the url!";
++ //debug() << "m_tracksHashByUrl already contains url " << url;
+ //need to replace, not overwrite/add a new one
+ QStringList *oldValues = m_tracksHashByUrl[url];
+ QString oldId = oldValues->at( 0 );
+@@ -490,8 +570,24 @@ ScanResultProcessor::addTrack( const QVa
+ m_tracksHashById.insert( id, trackList );
+ }
+
++ //debug() << "album = " << album;
++
+ if( m_tracksHashByAlbum.contains( album ) && m_tracksHashByAlbum[album] != 0 )
+- m_tracksHashByAlbum[album]->append( trackList );
++ {
++ //contains isn't the fastest on linked lists, but in reality this is on the order of maybe
++ //ten quick pointer comparisons per track on average...probably lower
++ //debug() << "trackList is " << trackList;
++ if( !m_tracksHashByAlbum[album]->contains( trackList ) )
++ {
++ //debug() << "appending trackList to m_tracksHashByAlbum";
++ m_tracksHashByAlbum[album]->append( trackList );
++ }
++ else
++ {
++ //debug() << "not appending trackList to m_tracksHashByAlbum";
++ }
++
++ }
+ else
+ {
+ QLinkedList<QStringList*> *list = new QLinkedList<QStringList*>();
+@@ -595,6 +691,8 @@ ScanResultProcessor::albumId( const QStr
+ QLinkedList<QStringList*> *list = m_albumsHashByName[album];
+ foreach( QStringList *slist, *list )
+ {
++ //debug() << "albumArtistId = " << albumArtistId;
++ //debug() << "Checking list: " << *slist;
+ if( slist->at( 2 ).isEmpty() && albumArtistId == 0 )
+ {
+ //debug() << "artist is empty and albumArtistId = 0, returning " << slist->at( 0 );
+@@ -631,7 +729,10 @@ ScanResultProcessor::albumInsert( const
+ albumList->append( QString() );
+ m_albumsHashById[returnedNum] = albumList;
+ if( m_albumsHashByName.contains( album ) && m_albumsHashByName[album] != 0 )
+- m_albumsHashByName[album]->append( albumList );
++ {
++ if( !m_albumsHashByName[album]->contains( albumList ) )
++ m_albumsHashByName[album]->append( albumList );
++ }
+ else
+ {
+ QLinkedList<QStringList*> *list = new QLinkedList<QStringList*>();
+@@ -645,7 +746,7 @@ ScanResultProcessor::albumInsert( const
+ int
+ ScanResultProcessor::urlId( const QString &url, const QString &uid )
+ {
+- /*
++/*
+ DEBUG_BLOCK
+ foreach( QString key, m_urlsHashByUid.keys() )
+ debug() << "Key: " << key << ", list: " << *m_urlsHashByUid[key];
+@@ -654,8 +755,7 @@ ScanResultProcessor::urlId( const QStrin
+ typedef QPair<int, QString> blahType; //QFOREACH is stupid when it comes to QPairs
+ foreach( blahType key, m_urlsHashByLocation.keys() )
+ debug() << "Key: " << key << ", list: " << *m_urlsHashByLocation[key];
+- */
+-
++*/
+ QFileInfo fileInfo( url );
+ const QString dir = fileInfo.absoluteDir().absolutePath();
+ int dirId = directoryId( dir );
+@@ -665,6 +765,7 @@ ScanResultProcessor::urlId( const QStrin
+ QPair<int, QString> locationPair( deviceId, rpath );
+ //debug() << "in urlId with url = " << url << " and uid = " << uid;
+ //debug() << "checking locationPair " << locationPair;
++/*
+ if( m_urlsHashByLocation.contains( locationPair ) )
+ {
+ QStringList values;
+@@ -674,6 +775,7 @@ ScanResultProcessor::urlId( const QStrin
+ values << "zero";
+ //debug() << "m_urlsHashByLocation contains it! It is " << values;
+ }
++*/
+ QStringList currUrlIdValues;
+ if( m_urlsHashByUid.contains( uid ) && m_urlsHashByUid[uid] != 0 )
+ currUrlIdValues = *m_urlsHashByUid[uid];
+@@ -717,6 +819,7 @@ ScanResultProcessor::urlId( const QStrin
+ //debug() << "m_urlsHashByUid contains this UID, updating deviceId and path";
+ QStringList *list = m_urlsHashByUid[uid];
+ //debug() << "list from UID hash is " << list << " with values " << *list;
++ QPair<int, QString> oldLocationPair( list->at( 1 ).toInt(), list->at( 2 ) );
+ list->replace( 1, QString::number( deviceId ) );
+ list->replace( 2, rpath );
+ list->replace( 3, QString::number( dirId ) );
+@@ -737,6 +840,7 @@ ScanResultProcessor::urlId( const QStrin
+ delete oldList;
+ }
+ m_urlsHashByLocation[locationPair] = list;
++ m_urlsHashByLocation.remove( oldLocationPair );
+ }
+ m_permanentTablesUrlUpdates.insert( uid, url );
+ m_changedUrls.insert( uid, QPair<QString, QString>( MountPointManager::instance()->getAbsolutePath( currUrlIdValues[1].toInt(), currUrlIdValues[2] ), url ) );
+@@ -751,6 +855,7 @@ ScanResultProcessor::urlId( const QStrin
{
- item->playlist()->setId( metadata->playlist_id );
+ QStringList *list = m_urlsHashByLocation[locationPair];
+ //debug() << "Replacing hash " << list->at( 4 ) << " with " << uid;
++ QString oldId = list->at( 4 );
+ list->replace( 4, uid );
+ if( m_urlsHashByUid.contains( uid )
+ && m_urlsHashByUid[uid] != 0
+@@ -762,6 +867,7 @@ ScanResultProcessor::urlId( const QStrin
+ delete oldList;
+ }
+ m_urlsHashByUid[uid] = list;
++ m_urlsHashByUid.remove( oldId );
+ }
+ m_permanentTablesUidUpdates.insert( url, uid );
+ m_changedUids.insert( currUrlIdValues[4], uid );
+@@ -855,7 +961,8 @@ ScanResultProcessor::directoryId( const
+ int
+ ScanResultProcessor::checkExistingAlbums( const QString &album )
+ {
+-// DEBUG_BLOCK
++ //DEBUG_BLOCK
++ //debug() << "looking for album " << album;
+ // "Unknown" albums shouldn't be handled as compilations
+ if( album.isEmpty() )
+ return 0;
+@@ -865,7 +972,10 @@ ScanResultProcessor::checkExistingAlbums
+ //it's probably a compilation.
+ //this handles A1 compilations that were automatically organized by Amarok
+ if( !m_albumsHashByName.contains( album ) || m_albumsHashByName[album] == 0 )
++ {
++ //debug() << "hashByName doesn't contain album, or it's zero";
+ return 0;
++ }
+
+ QStringList trackIds;
+ QLinkedList<QStringList*> *llist = m_albumsHashByName[album];
+@@ -915,8 +1025,10 @@ ScanResultProcessor::checkExistingAlbums
+ }
+ }
+
++ //debug() << "trackIds = " << trackIds;
+ if( trackIds.isEmpty() )
+ {
++ //debug() << "trackIds empty, returning zero";
+ return 0;
+ }
+ else
+@@ -933,6 +1045,7 @@ ScanResultProcessor::checkExistingAlbums
+ list->replace( 3, compilationString );
+ }
+ }
++ //debug() << "returning " << compilationId;
+ return compilationId;
+ }
+ }
+@@ -1167,6 +1280,17 @@ ScanResultProcessor::copyHashesToTempTab
+ foreach( blahType key, m_urlsHashByLocation.keys() )
+ debug() << "Key: " << key << ", list: " << *m_urlsHashByLocation[key];
+ debug() << "Next album num: " << m_nextAlbumNum;
++
++ foreach( int key, m_tracksHashById.keys() )
++ debug() << "Key: " << key << ", list: " << *m_tracksHashById[key];
++ foreach( int key, m_tracksHashByUrl.keys() )
++ debug() << "Key: " << key << ", list: " << *m_tracksHashByUrl[key];
++ foreach( int key, m_tracksHashByAlbum.keys() )
++ {
++ debug() << "Key: " << key;
++ foreach( QStringList* item, *m_tracksHashByAlbum[key] )
++ debug() << "list: " << item << " is " << *item;
++ }
+ */
+
+ DEBUG_BLOCK
diff --git a/audio/amarok/patches/patch-ab b/audio/amarok/patches/patch-ab
index 1594c1e0bc9..0a0fd5b541e 100644
--- a/audio/amarok/patches/patch-ab
+++ b/audio/amarok/patches/patch-ab
@@ -1,22 +1,12 @@
-$NetBSD: patch-ab,v 1.3 2007/07/01 00:33:53 wiz Exp $
+$NetBSD: patch-ab,v 1.4 2010/02/16 09:01:46 wiz Exp $
---- configure.orig 2007-06-17 19:52:02.000000000 +0000
-+++ configure
-@@ -37060,7 +37060,7 @@ if test "${ac_cv_lib_tunepimp_tr_GetPUID
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ltunepimp $LIBS"
-+LIBS="-ltunepimp $PTHREAD_LDFLAGS $PTHREAD_LIBS $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -37579,7 +37579,7 @@ if test "${ac_cv_lib_konqsidebarplugin__
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lkonqsidebarplugin $LIBS"
-+LIBS="-lkonqsidebarplugin ${PTHREAD_LIBS} ${PTHREAD_LDFLAGS} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
+--- src/collection/mysqlecollection/CMakeLists.txt.orig 2009-09-28 17:34:03.000000000 +0000
++++ src/collection/mysqlecollection/CMakeLists.txt
+@@ -82,6 +82,7 @@ if(APPLE)
+ SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ endif(APPLE)
+
++SET_TARGET_PROPERTIES(amarok_collection-mysqlecollection PROPERTIES LINK_FLAGS "@@WLR@@")
+ install(TARGETS amarok_collection-mysqlecollection DESTINATION ${PLUGIN_INSTALL_DIR} )
+
+ install(FILES ../sqlcollection/org.kde.amarok.SqlCollection.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/audio/amarok/patches/patch-ac b/audio/amarok/patches/patch-ac
index c6d039bb289..93b725d6642 100644
--- a/audio/amarok/patches/patch-ac
+++ b/audio/amarok/patches/patch-ac
@@ -1,19 +1,14 @@
-$NetBSD: patch-ac,v 1.3 2009/02/15 11:22:48 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2010/02/16 09:01:46 wiz Exp $
-SVN commit 917750 by nhnielsen:
-Fix for wikipedia tab not showing any info. Thanks to Helge Stenström
-and WarwickH at
-https://bugs.edge.launchpad.net/ubuntu/+source/amarok/+bug/316140 for
-the fix.
+post-2.2.2 patch from upstream
---- amarok/src/contextbrowser.cpp.orig 2008-08-13 21:21:51.000000000 +0000
-+++ amarok/src/contextbrowser.cpp
-@@ -4189,7 +4189,7 @@ ContextBrowser::wikiResult( KIO::Job* jo
- }
+--- src/collection/sqlcollection/ScanResultProcessor.h.orig 2010-01-06 22:19:46.000000000 +0000
++++ src/collection/sqlcollection/ScanResultProcessor.h
+@@ -94,6 +94,7 @@ class ScanResultProcessor : public QObje
+ QMap<QString, int> m_directories;
+ QMap<QString, QList< QPair< QString, QString > > > m_imageMap;
- // Ok lets remove the top and bottom parts of the page
-- m_wiki = m_wiki.mid( m_wiki.find( "<h1 class=\"firstHeading\">" ) );
-+ m_wiki = m_wiki.mid( m_wiki.find( "<h1 id=\"firstHeading\"" ) );
- m_wiki = m_wiki.mid( 0, m_wiki.find( "<div class=\"printfooter\">" ) );
- // Adding back license information
- m_wiki += copyright;
++ QSet<QString> m_uidsSeenThisScan;
+ QHash<QString, uint> m_filesInDirs;
+
+ TrackUrls m_changedUids; //not really track urls
diff --git a/audio/amarok/patches/patch-ad b/audio/amarok/patches/patch-ad
deleted file mode 100644
index ace497e89dd..00000000000
--- a/audio/amarok/patches/patch-ad
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/01/12 12:33:40 wiz Exp $
-
-Security fix, SVN r908415 from upstream 1.4.x branch.
-
---- amarok/src/metadata/audible/audibletag.cpp.orig 2008-08-13 23:21:51.000000000 +0200
-+++ amarok/src/metadata/audible/audibletag.cpp
-@@ -71,7 +71,8 @@ void Audible::Tag::readTags( FILE *fp )
- {
- char buf[1023];
- fseek(fp, OFF_PRODUCT_ID, SEEK_SET);
-- fread(buf, strlen("product_id"), 1, fp);
-+ if (fread(buf, strlen("product_id"), 1, fp) != 1)
-+ return;
- if(memcmp(buf, "product_id", strlen("product_id")))
- {
- buf[20]='\0';
-@@ -130,24 +131,65 @@ void Audible::Tag::readTags( FILE *fp )
-
- bool Audible::Tag::readTag( FILE *fp, char **name, char **value)
- {
-+ // arbitrary value that has to be smaller than 2^32-1 and that should be large enough for all tags
-+ const uint32_t maxtaglen = 100000;
-+
- uint32_t nlen;
-- fread(&nlen, sizeof(nlen), 1, fp);
-+ if (fread(&nlen, sizeof(nlen), 1, fp) != 1)
-+ return false;
- nlen = ntohl(nlen);
- //fprintf(stderr, "tagname len=%x\n", (unsigned)nlen);
-- *name = new char[nlen+1];
-- (*name)[nlen] = '\0';
-+ if (nlen > maxtaglen)
-+ return false;
-
- uint32_t vlen;
-- fread(&vlen, sizeof(vlen), 1, fp);
-+ if (fread(&vlen, sizeof(vlen), 1, fp) != 1)
-+ return false;
- vlen = ntohl(vlen);
- //fprintf(stderr, "tag len=%x\n", (unsigned)vlen);
-+ if (vlen > maxtaglen)
-+ return false;
-+
-+ *name = new char[nlen+1];
-+ if (!*name)
-+ return false;
-+
- *value = new char[vlen+1];
-+ if (!*value)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ return false;
-+ }
-+
-+ (*name)[nlen] = '\0';
- (*value)[vlen] = '\0';
-
-- fread(*name, nlen, 1, fp);
-- fread(*value, vlen, 1, fp);
-+ if (fread(*name, nlen, 1, fp) != 1)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ delete[] *value;
-+ *value = 0;
-+ return false;
-+ }
-+ if (fread(*value, vlen, 1, fp) != 1)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ delete[] *value;
-+ *value = 0;
-+ return false;
-+ }
- char lasttag;
-- fread(&lasttag, 1, 1, fp);
-+ if (fread(&lasttag, 1, 1, fp) != 1)
-+ {
-+ delete[] *name;
-+ *name = 0;
-+ delete[] *value;
-+ *value = 0;
-+ return false;
-+ }
- //fprintf(stderr, "%s: \"%s\"\n", *name, *value);
-
- m_tagsEndOffset += 2 * 4 + nlen + vlen + 1;