3 files changed, 132 insertions, 124 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 7454d19dcd38..b9161433d9d9 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -1,11 +1,8 @@
-# New ports collection makefile for:	amarok
-# Date created:			Tue Feb 24 02:21:14 CET 2004
-# Whom:				Markus Brueffer <markus@FreeBSD.org>
-#
+# Created by: Markus Brueffer <markus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	2.6.0
+PORTVERSION=	2.7.0
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
@@ -13,22 +10,22 @@ MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE music player
 
-LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib \
-		tag-extras.1:${PORTSDIR}/audio/taglib-extras \
-		lastfm.0:${PORTSDIR}/audio/liblastfm \
+LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib \
+		tag-extras:${PORTSDIR}/audio/taglib-extras \
 		ofa:${PORTSDIR}/audio/libofa \
-		avcodec.1:${PORTSDIR}/multimedia/ffmpeg \
-		qjson.0:${PORTSDIR}/devel/qjson \
-		qca.2:${PORTSDIR}/devel/qca \
-		dbus-1.3:${PORTSDIR}/devel/dbus \
-		kcddb.5:${PORTSDIR}/multimedia/kdemultimedia4
+		avcodec:${PORTSDIR}/multimedia/ffmpeg \
+		qjson:${PORTSDIR}/devel/qjson \
+		qca:${PORTSDIR}/devel/qca \
+		dbus-1:${PORTSDIR}/devel/dbus \
+		nepomukcore:${PORTSDIR}/sysutils/nepomuk-core
 BUILD_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator
 RUN_DEPENDS=	${LOCALBASE}/lib/qt4/plugins/script/libqtscript_core.so.1.0.0:${PORTSDIR}/devel/qtscriptgenerator \
 		${KDE4_PREFIX}/lib/kde4/kio_upnp_ms.so:${PORTSDIR}/net/kio-upnp-ms
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-USE_KDE4=	kdehier kdelibs kdeprefix runtime automoc4 strigi
+USE_KDE4=	kdehier kdelibs kdeprefix libkcddb \
+		libkcompactdisc runtime automoc4 sharedmime strigi
 USE_MYSQL=	embedded
 USE_QT4=	dbus designer gui network opengl \
 		phonon script sql svg webkit xml \
@@ -39,11 +36,12 @@ USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	IPOD MP3TUNES MTP
-IPOD_DESC=	iPod support
-MP3TUNES_DESC=	MP3tunes support
+OPTIONS_DEFINE=	AMAZON IPOD MP3TUNES MTP
+OPTIONS_DEFAULT=IPOD MP3TUNES MTP
 
-OPTIONS_DEFAULT=	IPOD MP3TUNES MTP
+AMAZON_DESC=	Amazon MP3 store support via clamz
+IPOD_DESC=	Apple iPod support
+MP3TUNES_DESC=	MP3tunes support
 
 .include <bsd.port.options.mk>
 
@@ -51,8 +49,12 @@ OPTIONS_DEFAULT=	IPOD MP3TUNES MTP
 BROKEN=		does not build on sparc64 (GCC-related error)
 .endif
 
+.if ${PORT_OPTIONS:MAMAZON}
+RUN_DEPENDS+=	clamz:${PORTSDIR}/net/clamz
+.endif
+
 .if ${PORT_OPTIONS:MIPOD}
-LIB_DEPENDS+=	gpod.7:${PORTSDIR}/audio/libgpod
+LIB_DEPENDS+=	gpod:${PORTSDIR}/audio/libgpod
 USE_GNOME+=	gdkpixbuf2 glib20
 PLIST_SUB+=	IPOD=""
 .else
@@ -61,8 +63,8 @@ PLIST_SUB+=	IPOD="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMP3TUNES}
-LIB_DEPENDS+=	loudmouth-1.0:${PORTSDIR}/net-im/loudmouth \
-		curl.6:${PORTSDIR}/ftp/curl
+LIB_DEPENDS+=	loudmouth-1:${PORTSDIR}/net-im/loudmouth \
+		curl:${PORTSDIR}/ftp/curl
 USE_GNOME+=	glib20 libxml2
 PLIST_SUB+=	MP3TUNES=""
 .else
@@ -71,7 +73,7 @@ PLIST_SUB+=	MP3TUNES="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MMTP}
-LIB_DEPENDS+=	mtp.9:${PORTSDIR}/audio/libmtp
+LIB_DEPENDS+=	mtp:${PORTSDIR}/audio/libmtp
 PLIST_SUB+=	MTP=""
 .else
 CMAKE_ARGS+=	-DWITH_Mtp:BOOL=Off
@@ -86,10 +88,20 @@ CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-post-extract:
-	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/modules/FindMySQLAmarok.cmake
-	${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
+	@${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \
 		${WRKSRC}/cmake/modules/FindLoudmouth.cmake
+# Avoid installing MIME types prior to install stage.
+	@${REINPLACE_CMD} -e '/XDG.*EXECUTABLE/ d' \
+		${WRKSRC}/utilities/amzdownloader/CMakeLists.txt
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/utilities/amzdownloader/amzdownloader.xml \
+		${PREFIX}/share/mime/packages
+	${INSTALL_SCRIPT} ${WRKSRC}/utilities/amzdownloader/amzdownloader.desktop \
+		${PREFIX}/share/applications/kde4
+	@-update-mime-database ${PREFIX}/share/mime
 
 .include <bsd.port.mk>
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index 3a3541830dec..706b2b964f82 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (amarok-2.6.0.tar.bz2) = a91280e588181cf9363d7146f339ef527220fe0c8057f26f010f592b01fdd2c0
-SIZE (amarok-2.6.0.tar.bz2) = 42331208
+SHA256 (amarok-2.7.0.tar.bz2) = 39649075f77e73dc7e0c1842b93de870b2f400cfd008907791ee81055a075d49
+SIZE (amarok-2.7.0.tar.bz2) = 42873142
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index 21d51006bece..350db09a68fe 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -3,6 +3,7 @@ bin/amarok_afttagger
 bin/amarokcollectionscanner
 %%MP3TUNES%%bin/amarokmp3tunesharmonydaemon
 bin/amarokpkg
+bin/amzdownloader
 lib/kde4/amarok_appletscript_simple_javascript.so
 lib/kde4/amarok_collection-audiocdcollection.so
 lib/kde4/amarok_collection-daapcollection.so
@@ -10,6 +11,7 @@ lib/kde4/amarok_collection-daapcollection.so
 %%MTP%%lib/kde4/amarok_collection-mtpcollection.so
 lib/kde4/amarok_collection-mysqlecollection.so
 lib/kde4/amarok_collection-mysqlservercollection.so
+lib/kde4/amarok_collection-nepomukcollection.so
 lib/kde4/amarok_collection-playdarcollection.so
 lib/kde4/amarok_collection-umscollection.so
 lib/kde4/amarok_collection-upnpcollection.so
@@ -20,35 +22,24 @@ lib/kde4/amarok_context_applet_info.so
 lib/kde4/amarok_context_applet_labels.so
 lib/kde4/amarok_context_applet_lyrics.so
 lib/kde4/amarok_context_applet_photos.so
-lib/kde4/amarok_context_applet_similarArtists.so
-lib/kde4/amarok_context_applet_spectrum_analyzer.so
 lib/kde4/amarok_context_applet_tabs.so
-lib/kde4/amarok_context_applet_upcomingEvents.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_labels.so
 lib/kde4/amarok_data_engine_lyrics.so
 lib/kde4/amarok_data_engine_photos.so
-lib/kde4/amarok_data_engine_similarArtists.so
-lib/kde4/amarok_data_engine_spectrum_analyzer.so
 lib/kde4/amarok_data_engine_tabs.so
-lib/kde4/amarok_data_engine_upcomingEvents.so
 lib/kde4/amarok_data_engine_wikipedia.so
-lib/kde4/amarok_device_massstorage.so
-lib/kde4/amarok_device_nfs.so
-lib/kde4/amarok_device_smb.so
 lib/kde4/amarok_runnerscript_javascript.so
 lib/kde4/amarok_service_amazonstore.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
 %%MP3TUNES%%lib/kde4/amarok_service_mp3tunes.so
 lib/kde4/amarok_service_opmldirectory.so
 lib/kde4/kcm_amarok_service_amazonstore.so
 lib/kde4/kcm_amarok_service_ampache.so
-lib/kde4/kcm_amarok_service_lastfm.so
 lib/kde4/kcm_amarok_service_magnatunestore.so
 %%MP3TUNES%%lib/kde4/kcm_amarok_service_mp3tunes.so
 lib/libamarok-sqlcollection.so
@@ -72,18 +63,17 @@ lib/libamarokpud.so.1.0.0
 lib/libampache_account_login.so
 share/applications/kde4/amarok.desktop
 share/applications/kde4/amarok_containers.desktop
+share/applications/kde4/amzdownloader.desktop
 share/apps/amarok/amarok.notifyrc
 share/apps/amarok/data/DefaultPlaylistLayouts.xml
 share/apps/amarok/data/InfoAppletCustomStyle.css
 share/apps/amarok/data/InfoParserLoading.html
-share/apps/amarok/data/SpectrumAnalyzerAppletCustomStyle.css
 share/apps/amarok/data/WikipediaCustomStyle.css
 share/apps/amarok/data/bullet.gif
 share/apps/amarok/data/first_run_jingle.ogg
 share/apps/amarok/data/hover_info_template.html
 share/apps/amarok/data/info_frontpage.html
 share/apps/amarok/data/podcast_directory.opml
-share/apps/amarok/data/upcoming-events-map.html
 share/apps/amarok/icons/hicolor/128x128/status/audio-volume-high-amarok.png
 share/apps/amarok/icons/hicolor/128x128/status/audio-volume-low-amarok.png
 share/apps/amarok/icons/hicolor/128x128/status/audio-volume-medium-amarok.png
@@ -411,7 +401,6 @@ share/apps/amarok/images/hover_info_dynamic_playlists.png
 share/apps/amarok/images/hover_info_files.png
 share/apps/amarok/images/hover_info_internet.png
 share/apps/amarok/images/hover_info_jamendo.png
-share/apps/amarok/images/hover_info_lastfm.png
 share/apps/amarok/images/hover_info_magnatune.png
 share/apps/amarok/images/hover_info_playlists.png
 share/apps/amarok/images/hover_info_podcasts.png
@@ -477,7 +466,6 @@ share/apps/amarok/scripts/script_console/script.spec
 share/apps/desktoptheme/default/widgets/amarok-albums.svg
 share/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
 share/apps/desktoptheme/default/widgets/amarok-info-applet.svg
-share/apps/desktoptheme/default/widgets/amarok-spectrum-analyzer-applet.svg
 share/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
 share/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
 share/apps/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
@@ -532,8 +520,8 @@ share/doc/HTML/en/amarok/Icon-view-list-tree.png
 share/doc/HTML/en/amarok/Icon-view-refresh.png
 share/doc/HTML/en/amarok/action-collection-amarok48.png
 share/doc/HTML/en/amarok/advancedtok.png
-share/doc/HTML/en/amarok/album.png
 share/doc/HTML/en/amarok/albumbar.png
+share/doc/HTML/en/amarok/amarok-2-6-duplicates-during-collection-scan.png
 share/doc/HTML/en/amarok/amarok-apg-presets-toolbar.png
 share/doc/HTML/en/amarok/amarok-context.png
 share/doc/HTML/en/amarok/amarok-e17.png
@@ -545,44 +533,54 @@ share/doc/HTML/en/amarok/amarok-maintoolbar.png
 share/doc/HTML/en/amarok/amarok-managing-media.png
 share/doc/HTML/en/amarok/amarok-newdynamic-detail.png
 share/doc/HTML/en/amarok/amarok-newdynamic.png
-share/doc/HTML/en/amarok/amarok-renameplaylist.png
 share/doc/HTML/en/amarok/amarok-slimtoolbar.png
+share/doc/HTML/en/amarok/amarok-statsyncing.png
 share/doc/HTML/en/amarok/amarok-xfce.png
 share/doc/HTML/en/amarok/amarok2-4-1albumtageditdialog.png
 share/doc/HTML/en/amarok/amarok2-4-1albumtageditpertrackdialog.png
-share/doc/HTML/en/amarok/amarok2-4-1configplayback.png
-share/doc/HTML/en/amarok/amarok2-4-1configscripts.png
-share/doc/HTML/en/amarok/amarok2-4-1configspeakersetup.png
-share/doc/HTML/en/amarok/amarok2-4-1configuredialog.png
 share/doc/HTML/en/amarok/amarok2-4-1configuredialogcollection.png
-share/doc/HTML/en/amarok/amarok2-4-1configuredialogplugins.png
-share/doc/HTML/en/amarok/amarok2-4-1databaseconfig.png
 share/doc/HTML/en/amarok/amarok2-4-1editfilterdialog.png
 share/doc/HTML/en/amarok/amarok2-4-1filenamelayoutchooseroptions.png
 share/doc/HTML/en/amarok/amarok2-4-1mergedviewcollection.png
 share/doc/HTML/en/amarok/amarok2-4-1non-mergedviewcollection.png
-share/doc/HTML/en/amarok/amarok2-4-1notifications.png
-share/doc/HTML/en/amarok/amarok2-4-1phononbackends.png
-share/doc/HTML/en/amarok/amarok2-4-1phonondevices.png
-share/doc/HTML/en/amarok/amarok2-4-1saveplaylistchoices.png
 share/doc/HTML/en/amarok/amarok2-4-1tageditdialog.png
 share/doc/HTML/en/amarok/amarok2-4-1viewmenu.png
-share/doc/HTML/en/amarok/amarok2-4.png
 share/doc/HTML/en/amarok/amarok2-4collectionsortingmenu.png
-share/doc/HTML/en/amarok/amarok2-4helpmenu.png
 share/doc/HTML/en/amarok/amarok2-4musicbrainztagger.png
 share/doc/HTML/en/amarok/amarok2-4organizefilesadvanceddialog.png
 share/doc/HTML/en/amarok/amarok2-4organizefilesbasicdialog.png
 share/doc/HTML/en/amarok/amarok2-4queueeditor.png
 share/doc/HTML/en/amarok/amarok2-4searchplaylist.png
-share/doc/HTML/en/amarok/amarok2-4transcodetracksdialog.png
+share/doc/HTML/en/amarok/amarok2-6.png
+share/doc/HTML/en/amarok/amarok2-6appletbrowser.png
+share/doc/HTML/en/amarok/amarok2-6configgeneralmenu.png
+share/doc/HTML/en/amarok/amarok2-6flactranscodemenu.png
+share/doc/HTML/en/amarok/amarok2-6helpmenu.png
+share/doc/HTML/en/amarok/amarok2-6playlistalbumcontextmenu.png
+share/doc/HTML/en/amarok/amarok2-6pluginsconfigmenu.png
+share/doc/HTML/en/amarok/amarok2-6scriptsconfigmenu.png
+share/doc/HTML/en/amarok/amarok2-6trackcontextmenu.png
+share/doc/HTML/en/amarok/amarok2-6transcodemenu.png
+share/doc/HTML/en/amarok/amarok2-6viewconfigmenu.png
+share/doc/HTML/en/amarok/amarok2-6viewundocksymbols.png
+share/doc/HTML/en/amarok/amarok2-7addtoplaylist.png
+share/doc/HTML/en/amarok/amarok2-7aftersplash.png
+share/doc/HTML/en/amarok/amarok2-7menutools.png
+share/doc/HTML/en/amarok/amarok2-7networkrequestsviewer.png
+share/doc/HTML/en/amarok/amarok2-7removefromplaylist.png
+share/doc/HTML/en/amarok/amarok2-7renamesavedplaylist.png
+share/doc/HTML/en/amarok/amarok2-7saveplaylistchoices.png
+share/doc/HTML/en/amarok/amarok2-7settingsplugins.png
+share/doc/HTML/en/amarok/amarok2-7themediasources.png
+share/doc/HTML/en/amarok/amarok2-7theplaylist.png
+share/doc/HTML/en/amarok/amarok2-7thetoolbar.png
 share/doc/HTML/en/amarok/amarok24_configureshortcutdetail.png
 share/doc/HTML/en/amarok/amarok24_configureshortcutsdialog.png
 share/doc/HTML/en/amarok/amarok24_settingsmenu.png
 share/doc/HTML/en/amarok/amarok24_settingsmenu_withreplaygain.png
 share/doc/HTML/en/amarok/amarok2_moodbar.png
+share/doc/HTML/en/amarok/amarok_2-6_layout.png
 share/doc/HTML/en/amarok/amarok_add-on_installer.png
-share/doc/HTML/en/amarok/amarok_addtoplaylist.png
 share/doc/HTML/en/amarok/amarok_addtoplaylist1.png
 share/doc/HTML/en/amarok/amarok_amarokmenu2-4.png
 share/doc/HTML/en/amarok/amarok_ampache_client2.png
@@ -610,37 +608,41 @@ share/doc/HTML/en/amarok/amarok_playlist_layout_nog2_s.png
 share/doc/HTML/en/amarok/amarok_playlist_layout_v1_s.png
 share/doc/HTML/en/amarok/amarok_playlist_manipulation.png
 share/doc/HTML/en/amarok/amarok_playlist_search_ex.png
-share/doc/HTML/en/amarok/amarok_removeformplaylist.png
 share/doc/HTML/en/amarok/amarok_saved_playlists.png
-share/doc/HTML/en/amarok/amarok_script_info.png
-share/doc/HTML/en/amarok/amarok_script_manager.png
 share/doc/HTML/en/amarok/amarok_show_only_matches.png
 share/doc/HTML/en/amarok/amarok_slim_toolbar.png
 share/doc/HTML/en/amarok/amarok_tracks_media_devices1.png
-share/doc/HTML/en/amarok/amarok_windowlayout.png
 share/doc/HTML/en/amarok/amarokbreadcrumb.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7database.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7notifications.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7phononbackend.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7phonondevice.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7phononhardware.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7playback.png
+share/doc/HTML/en/amarok/amarokconfigurationdialog2-7scriptconsole.png
+share/doc/HTML/en/amarok/amarokconfigurationdialoggeneral2-7.png
+share/doc/HTML/en/amarok/amarokconfigurationdialoglocalcollection2-7.png
 share/doc/HTML/en/amarok/amarokmediasources-files.png
 share/doc/HTML/en/amarok/amarokmediasources-home.png
+share/doc/HTML/en/amarok/amaroknepomukcollectionbrowser2-7.png
+share/doc/HTML/en/amarok/amaroknepomukpluginconfig2-7.png
 share/doc/HTML/en/amarok/amaroknew2-4.png
 share/doc/HTML/en/amarok/amarokrightmenu.png
 share/doc/HTML/en/amarok/amarokripcd.png
 share/doc/HTML/en/amarok/amaroksystray.png
 share/doc/HTML/en/amarok/amaroktoplevelmenus2-4.png
 share/doc/HTML/en/amarok/amarokwindow_context.png
-share/doc/HTML/en/amarok/amarokwindow_mediasources.png
-share/doc/HTML/en/amarok/amarokwindow_playlist.png
 share/doc/HTML/en/amarok/apgpresetsmatchallgroup.png
-share/doc/HTML/en/amarok/app.png
+share/doc/HTML/en/amarok/applet_explorer.png
 share/doc/HTML/en/amarok/applications-internet.png
 share/doc/HTML/en/amarok/bookmarking_menu.png
 share/doc/HTML/en/amarok/cd_collection_sansa.png
 share/doc/HTML/en/amarok/common
-share/doc/HTML/en/amarok/context_menu.png
 share/doc/HTML/en/amarok/contextpane.png
 share/doc/HTML/en/amarok/contextpanestopped.png
 share/doc/HTML/en/amarok/controlamarok.png
+share/doc/HTML/en/amarok/desktop_search.png
 share/doc/HTML/en/amarok/document-save.png
-share/doc/HTML/en/amarok/dynamic_playlist.png
 share/doc/HTML/en/amarok/edit-redo.png
 share/doc/HTML/en/amarok/edit-undo.png
 share/doc/HTML/en/amarok/favor.png
@@ -659,18 +661,19 @@ share/doc/HTML/en/amarok/installation1-1.png
 share/doc/HTML/en/amarok/installation2.png
 share/doc/HTML/en/amarok/installation3.png
 share/doc/HTML/en/amarok/installation4.png
+share/doc/HTML/en/amarok/ipod-connected-dialog.png
+share/doc/HTML/en/amarok/last-fm-spelling-correction.png
+share/doc/HTML/en/amarok/matchedtrackspage.png
 share/doc/HTML/en/amarok/media_sources1.png
 share/doc/HTML/en/amarok/media_sources3.png
 share/doc/HTML/en/amarok/mediasources.png
 share/doc/HTML/en/amarok/mediasources10.png
-share/doc/HTML/en/amarok/mediasources4.png
 share/doc/HTML/en/amarok/mediasources5.png
 share/doc/HTML/en/amarok/mediasources6.png
 share/doc/HTML/en/amarok/mediasources7.png
 share/doc/HTML/en/amarok/mediasources8.png
 share/doc/HTML/en/amarok/mediasourcesex.png
-share/doc/HTML/en/amarok/new_amarok_configuration_options_general_edit.png
-share/doc/HTML/en/amarok/new_amarok_configuration_options_notifications_edit.png
+share/doc/HTML/en/amarok/metadatadialog.png
 share/doc/HTML/en/amarok/nocover_amarok.png
 share/doc/HTML/en/amarok/oraganize_menu.png
 share/doc/HTML/en/amarok/otherplatforms_nonkde.png
@@ -678,7 +681,6 @@ share/doc/HTML/en/amarok/otherplatforms_osx.png
 share/doc/HTML/en/amarok/otherplatforms_windows.png
 share/doc/HTML/en/amarok/playlist-layout-editor-amarok.png
 share/doc/HTML/en/amarok/playlist-layout-item-configuration-amarok.png
-share/doc/HTML/en/amarok/playlist2.png
 share/doc/HTML/en/amarok/playlist_save.png
 share/doc/HTML/en/amarok/playlistlayout1.png
 share/doc/HTML/en/amarok/playlistlayout2.png
@@ -690,12 +692,10 @@ share/doc/HTML/en/amarok/playlistqueue.png
 share/doc/HTML/en/amarok/playlistsearch.png
 share/doc/HTML/en/amarok/queue.png
 share/doc/HTML/en/amarok/queueend.png
-share/doc/HTML/en/amarok/remotecollections_ampache_client.png
 share/doc/HTML/en/amarok/remotecollections_ampache_client1.png
 share/doc/HTML/en/amarok/remotecollections_ampache_client2.png
 share/doc/HTML/en/amarok/remotecollections_client.png
 share/doc/HTML/en/amarok/remotecollections_daap.png
-share/doc/HTML/en/amarok/remotecollections_daap_config.png
 share/doc/HTML/en/amarok/remotecollections_samba_server.png
 share/doc/HTML/en/amarok/remotecollections_samba_server1.png
 share/doc/HTML/en/amarok/remotecollections_samba_server2.png
@@ -703,7 +703,7 @@ share/doc/HTML/en/amarok/remotecollections_samba_server3.png
 share/doc/HTML/en/amarok/searchincollection.png
 share/doc/HTML/en/amarok/searchincollection_example_editbox.png
 share/doc/HTML/en/amarok/searchincollection_example_editbox2.png
-share/doc/HTML/en/amarok/settings-internet-amarok.png
+share/doc/HTML/en/amarok/slim_toolbar.png
 share/doc/HTML/en/amarok/sorting.png
 share/doc/HTML/en/amarok/sorting2.png
 share/doc/HTML/en/amarok/tagedit_fromfile_advanced.png
@@ -711,13 +711,10 @@ share/doc/HTML/en/amarok/tagedit_fromfile_advanced_example.png
 share/doc/HTML/en/amarok/tagedit_fromfile_basic.png
 share/doc/HTML/en/amarok/tagedit_fromfile_basic_example.png
 share/doc/HTML/en/amarok/toolbar_main.png
-share/doc/HTML/en/amarok/toolbar_slim.png
-share/doc/HTML/en/amarok/toolmenu.png
 share/doc/HTML/en/amarok/tools_bookmarkmanager.png
 share/doc/HTML/en/amarok/tools_covermanager.png
 share/doc/HTML/en/amarok/tools_equalizer.png
 share/doc/HTML/en/amarok/track_progression.png
-share/doc/HTML/en/amarok/transcode_1.png
 share/doc/HTML/en/amarok/view-media-playlist.png
 share/doc/HTML/es/amarok/common
 share/doc/HTML/es/amarok/index.cache.bz2
@@ -913,48 +910,57 @@ share/doc/HTML/sv/amarok/firstruncollection2.png
 share/doc/HTML/sv/amarok/index.cache.bz2
 share/doc/HTML/sv/amarok/index.docbook
 share/doc/HTML/uk/amarok/advancedtok.png
-share/doc/HTML/uk/amarok/album.png
 share/doc/HTML/uk/amarok/albumbar.png
+share/doc/HTML/uk/amarok/amarok-2-6-duplicates-during-collection-scan.png
 share/doc/HTML/uk/amarok/amarok-context.png
 share/doc/HTML/uk/amarok/amarok-maintoolbar.png
 share/doc/HTML/uk/amarok/amarok-managing-media.png
 share/doc/HTML/uk/amarok/amarok-newdynamic-detail.png
 share/doc/HTML/uk/amarok/amarok-newdynamic.png
-share/doc/HTML/uk/amarok/amarok-renameplaylist.png
 share/doc/HTML/uk/amarok/amarok-slimtoolbar.png
 share/doc/HTML/uk/amarok/amarok2-4-1albumtageditdialog.png
 share/doc/HTML/uk/amarok/amarok2-4-1albumtageditpertrackdialog.png
-share/doc/HTML/uk/amarok/amarok2-4-1configplayback.png
-share/doc/HTML/uk/amarok/amarok2-4-1configscripts.png
-share/doc/HTML/uk/amarok/amarok2-4-1configspeakersetup.png
-share/doc/HTML/uk/amarok/amarok2-4-1configuredialog.png
 share/doc/HTML/uk/amarok/amarok2-4-1configuredialogcollection.png
-share/doc/HTML/uk/amarok/amarok2-4-1configuredialogplugins.png
-share/doc/HTML/uk/amarok/amarok2-4-1databaseconfig.png
 share/doc/HTML/uk/amarok/amarok2-4-1editfilterdialog.png
 share/doc/HTML/uk/amarok/amarok2-4-1filenamelayoutchooseroptions.png
 share/doc/HTML/uk/amarok/amarok2-4-1mergedviewcollection.png
 share/doc/HTML/uk/amarok/amarok2-4-1non-mergedviewcollection.png
-share/doc/HTML/uk/amarok/amarok2-4-1notifications.png
-share/doc/HTML/uk/amarok/amarok2-4-1phononbackends.png
-share/doc/HTML/uk/amarok/amarok2-4-1phonondevices.png
-share/doc/HTML/uk/amarok/amarok2-4-1saveplaylistchoices.png
+share/doc/HTML/uk/amarok/amarok2-4-1tageditdialog.png
 share/doc/HTML/uk/amarok/amarok2-4-1viewmenu.png
-share/doc/HTML/uk/amarok/amarok2-4.png
 share/doc/HTML/uk/amarok/amarok2-4collectionsortingmenu.png
-share/doc/HTML/uk/amarok/amarok2-4helpmenu.png
 share/doc/HTML/uk/amarok/amarok2-4musicbrainztagger.png
 share/doc/HTML/uk/amarok/amarok2-4organizefilesadvanceddialog.png
 share/doc/HTML/uk/amarok/amarok2-4organizefilesbasicdialog.png
 share/doc/HTML/uk/amarok/amarok2-4searchplaylist.png
-share/doc/HTML/uk/amarok/amarok2-4transcodetracksdialog.png
+share/doc/HTML/uk/amarok/amarok2-6.png
+share/doc/HTML/uk/amarok/amarok2-6appletbrowser.png
+share/doc/HTML/uk/amarok/amarok2-6configgeneralmenu.png
+share/doc/HTML/uk/amarok/amarok2-6flactranscodemenu.png
+share/doc/HTML/uk/amarok/amarok2-6helpmenu.png
+share/doc/HTML/uk/amarok/amarok2-6playlistalbumcontextmenu.png
+share/doc/HTML/uk/amarok/amarok2-6pluginsconfigmenu.png
+share/doc/HTML/uk/amarok/amarok2-6scriptsconfigmenu.png
+share/doc/HTML/uk/amarok/amarok2-6trackcontextmenu.png
+share/doc/HTML/uk/amarok/amarok2-6transcodemenu.png
+share/doc/HTML/uk/amarok/amarok2-6viewconfigmenu.png
+share/doc/HTML/uk/amarok/amarok2-6viewundocksymbols.png
+share/doc/HTML/uk/amarok/amarok2-7addtoplaylist.png
+share/doc/HTML/uk/amarok/amarok2-7aftersplash.png
+share/doc/HTML/uk/amarok/amarok2-7menutools.png
+share/doc/HTML/uk/amarok/amarok2-7removefromplaylist.png
+share/doc/HTML/uk/amarok/amarok2-7renamesavedplaylist.png
+share/doc/HTML/uk/amarok/amarok2-7saveplaylistchoices.png
+share/doc/HTML/uk/amarok/amarok2-7settingsplugins.png
+share/doc/HTML/uk/amarok/amarok2-7themediasources.png
+share/doc/HTML/uk/amarok/amarok2-7theplaylist.png
+share/doc/HTML/uk/amarok/amarok2-7thetoolbar.png
 share/doc/HTML/uk/amarok/amarok24_configureshortcutdetail.png
 share/doc/HTML/uk/amarok/amarok24_configureshortcutsdialog.png
 share/doc/HTML/uk/amarok/amarok24_settingsmenu.png
 share/doc/HTML/uk/amarok/amarok24_settingsmenu_withreplaygain.png
 share/doc/HTML/uk/amarok/amarok2_moodbar.png
+share/doc/HTML/uk/amarok/amarok_2-6_layout.png
 share/doc/HTML/uk/amarok/amarok_add-on_installer.png
-share/doc/HTML/uk/amarok/amarok_addtoplaylist.png
 share/doc/HTML/uk/amarok/amarok_addtoplaylist1.png
 share/doc/HTML/uk/amarok/amarok_amarokmenu2-4.png
 share/doc/HTML/uk/amarok/amarok_cover_manager.png
@@ -976,32 +982,35 @@ share/doc/HTML/uk/amarok/amarok_playlist_layout_nog2_s.png
 share/doc/HTML/uk/amarok/amarok_playlist_layout_v1_s.png
 share/doc/HTML/uk/amarok/amarok_playlist_manipulation.png
 share/doc/HTML/uk/amarok/amarok_playlist_search_ex.png
-share/doc/HTML/uk/amarok/amarok_removeformplaylist.png
 share/doc/HTML/uk/amarok/amarok_saved_playlists.png
-share/doc/HTML/uk/amarok/amarok_script_info.png
 share/doc/HTML/uk/amarok/amarok_show_only_matches.png
 share/doc/HTML/uk/amarok/amarok_slim_toolbar.png
 share/doc/HTML/uk/amarok/amarok_tracks_media_devices1.png
-share/doc/HTML/uk/amarok/amarok_windowlayout.png
 share/doc/HTML/uk/amarok/amarokbreadcrumb.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialog2-7database.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialog2-7notifications.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialog2-7phononbackend.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialog2-7phonondevice.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialog2-7phononhardware.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialog2-7playback.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialoggeneral2-7.png
+share/doc/HTML/uk/amarok/amarokconfigurationdialoglocalcollection2-7.png
 share/doc/HTML/uk/amarok/amarokmediasources-files.png
 share/doc/HTML/uk/amarok/amarokmediasources-home.png
+share/doc/HTML/uk/amarok/amaroknepomukpluginconfig2-7.png
 share/doc/HTML/uk/amarok/amaroknew2-4.png
 share/doc/HTML/uk/amarok/amarokrightmenu.png
 share/doc/HTML/uk/amarok/amarokripcd.png
 share/doc/HTML/uk/amarok/amaroksystray.png
 share/doc/HTML/uk/amarok/amarokwindow_context.png
-share/doc/HTML/uk/amarok/amarokwindow_mediasources.png
-share/doc/HTML/uk/amarok/amarokwindow_playlist.png
 share/doc/HTML/uk/amarok/apgpresetsmatchallgroup.png
-share/doc/HTML/uk/amarok/app.png
 share/doc/HTML/uk/amarok/bookmarking_menu.png
 share/doc/HTML/uk/amarok/cd_collection_sansa.png
 share/doc/HTML/uk/amarok/common
-share/doc/HTML/uk/amarok/context_menu.png
 share/doc/HTML/uk/amarok/contextpane.png
 share/doc/HTML/uk/amarok/contextpanestopped.png
 share/doc/HTML/uk/amarok/controlamarok.png
+share/doc/HTML/uk/amarok/desktop_search.png
 share/doc/HTML/uk/amarok/favor.png
 share/doc/HTML/uk/amarok/firstruncollection2.png
 share/doc/HTML/uk/amarok/generatingtree.png
@@ -1011,18 +1020,15 @@ share/doc/HTML/uk/amarok/media_sources1.png
 share/doc/HTML/uk/amarok/media_sources3.png
 share/doc/HTML/uk/amarok/mediasources.png
 share/doc/HTML/uk/amarok/mediasources10.png
-share/doc/HTML/uk/amarok/mediasources4.png
 share/doc/HTML/uk/amarok/mediasources5.png
 share/doc/HTML/uk/amarok/mediasources6.png
 share/doc/HTML/uk/amarok/mediasources7.png
 share/doc/HTML/uk/amarok/mediasources8.png
 share/doc/HTML/uk/amarok/mediasourcesex.png
-share/doc/HTML/uk/amarok/new_amarok_configuration_options_general_edit.png
-share/doc/HTML/uk/amarok/new_amarok_configuration_options_notifications_edit.png
+share/doc/HTML/uk/amarok/metadatadialog.png
 share/doc/HTML/uk/amarok/oraganize_menu.png
 share/doc/HTML/uk/amarok/playlist-layout-editor-amarok.png
 share/doc/HTML/uk/amarok/playlist-layout-item-configuration-amarok.png
-share/doc/HTML/uk/amarok/playlist2.png
 share/doc/HTML/uk/amarok/playlist_save.png
 share/doc/HTML/uk/amarok/playlistlayout1.png
 share/doc/HTML/uk/amarok/playlistlayout2.png
@@ -1046,15 +1052,14 @@ share/doc/HTML/uk/amarok/searchincollection_example_editbox2.png
 share/doc/HTML/uk/amarok/sorting.png
 share/doc/HTML/uk/amarok/sorting2.png
 share/doc/HTML/uk/amarok/tagedit_fromfile_advanced.png
+share/doc/HTML/uk/amarok/tagedit_fromfile_advanced_example.png
 share/doc/HTML/uk/amarok/tagedit_fromfile_basic.png
+share/doc/HTML/uk/amarok/tagedit_fromfile_basic_example.png
 share/doc/HTML/uk/amarok/toolbar_main.png
-share/doc/HTML/uk/amarok/toolbar_slim.png
-share/doc/HTML/uk/amarok/toolmenu.png
 share/doc/HTML/uk/amarok/tools_bookmarkmanager.png
 share/doc/HTML/uk/amarok/tools_covermanager.png
 share/doc/HTML/uk/amarok/tools_equalizer.png
 share/doc/HTML/uk/amarok/track_progression.png
-share/doc/HTML/uk/amarok/transcode_1.png
 share/icons/hicolor/128x128/apps/amarok.png
 share/icons/hicolor/16x16/apps/amarok.png
 share/icons/hicolor/22x22/apps/amarok.png
@@ -1069,20 +1074,14 @@ share/kde4/services/amarok-context-applet-info.desktop
 share/kde4/services/amarok-context-applet-labels.desktop
 share/kde4/services/amarok-context-applet-lyrics.desktop
 share/kde4/services/amarok-context-applet-photos.desktop
-share/kde4/services/amarok-context-applet-similarArtists.desktop
-share/kde4/services/amarok-context-applet-spectrum-analyzer.desktop
 share/kde4/services/amarok-context-applet-tabs.desktop
-share/kde4/services/amarok-context-applet-upcomingEvents.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-labels.desktop
 share/kde4/services/amarok-data-engine-lyrics.desktop
 share/kde4/services/amarok-data-engine-photos.desktop
-share/kde4/services/amarok-data-engine-similarArtists.desktop
-share/kde4/services/amarok-data-engine-spectrum-analyzer.desktop
 share/kde4/services/amarok-data-engine-tabs.desktop
-share/kde4/services/amarok-data-engine-upcomingEvents.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
@@ -1093,26 +1092,21 @@ share/kde4/services/amarok_collection-daapcollection.desktop
 %%MTP%%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-nepomukcollection.desktop
 share/kde4/services/amarok_collection-playdarcollection.desktop
 share/kde4/services/amarok_collection-umscollection.desktop
 share/kde4/services/amarok_collection-upnpcollection.desktop
-share/kde4/services/amarok_device_massstorage.desktop
-share/kde4/services/amarok_device_nfs.desktop
-share/kde4/services/amarok_device_smb.desktop
 share/kde4/services/amarok_service_amazonstore.desktop
 share/kde4/services/amarok_service_amazonstore_config.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
 %%MP3TUNES%%share/kde4/services/amarok_service_mp3tunes.desktop
 %%MP3TUNES%%share/kde4/services/amarok_service_mp3tunes_config.desktop
 share/kde4/services/amarok_service_opmldirectory.desktop
 share/kde4/services/amarokitpc.protocol
-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
@@ -1165,6 +1159,10 @@ share/kde4/servicetypes/amarok_plugin.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/amarok_scriptengine_qscript.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/amarokcollectionscanner_qt.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/amarokpkg.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/amarok.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/amarokpkg.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/amarok.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/amarok_scriptengine_qscript.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -1177,7 +1175,6 @@ share/kde4/servicetypes/amarok_plugin.desktop
 %%NLS%%share/locale/hu/LC_MESSAGES/amarok_scriptengine_qscript.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/amarokcollectionscanner_qt.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/amarokpkg.mo
-%%NLS%%share/locale/ia/LC_MESSAGES/amarokcollectionscanner_qt.mo
 %%NLS%%share/locale/it/LC_MESSAGES/amarok.mo
 %%NLS%%share/locale/it/LC_MESSAGES/amarok_scriptengine_qscript.mo
 %%NLS%%share/locale/it/LC_MESSAGES/amarokcollectionscanner_qt.mo
@@ -1257,10 +1254,7 @@ share/kde4/servicetypes/amarok_plugin.desktop
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/amarok_scriptengine_qscript.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/amarokcollectionscanner_qt.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/amarokpkg.mo
-%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/si
-%%NLS%%@dirrmtry share/locale/ia/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ia
+share/mime/packages/amzdownloader.xml
 @dirrm share/doc/HTML/uk/amarok
 @dirrm share/doc/HTML/sv/amarok
 @dirrm share/doc/HTML/ru/amarok
@@ -1294,3 +1288,5 @@ share/kde4/servicetypes/amarok_plugin.desktop
 @dirrm share/apps/amarok/icons
 @dirrm share/apps/amarok/data
 @dirrm share/apps/amarok
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true