maj amarok#2.2.0-1

3 files changed, 65 insertions, 36 deletions

diff --git a/kde/amarok/.footprint b/kde/amarok/.footprint
index 8cf713966..35d150766 100644
--- a/kde/amarok/.footprint
+++ b/kde/amarok/.footprint
@@ -4,42 +4,46 @@ drwxr-xr-x	root/root	opt/kde/bin/
 -rwxr-xr-x	root/root	opt/kde/bin/amarok
 -rwxr-xr-x	root/root	opt/kde/bin/amarok_afttagger
 -rwxr-xr-x	root/root	opt/kde/bin/amarokcollectionscanner
+-rwxr-xr-x	root/root	opt/kde/bin/amarokpkg
 drwxr-xr-x	root/root	opt/kde/lib/
 drwxr-xr-x	root/root	opt/kde/lib/kde4/
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_appletscript_simple_javascript.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_collection-audiocdcollection.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_collection-daapcollection.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_collection-mysqlecollection.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_collection-mysqlservercollection.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_collection-umscollection.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_containment_vertical.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_albums.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_bookmark.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_currenttrack.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_info.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_lyrics.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_mediadevices.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_serviceinfo.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_photos.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_videoclip.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_context_applet_wikipedia.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_current.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_info.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_lyrics.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_service.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_photos.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_videoclip.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_data_engine_wikipedia.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_massstorage-device.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_runnerscript_javascript.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_service_ampache.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_service_jamendo.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_service_lastfm.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_service_magnatunestore.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_service_opmldirectory.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/amarok_service_shoutcast.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kcm_amarok_service_ampache.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/kcm_amarok_service_lastfm.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kcm_amarok_service_magnatunestore.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/libamarok_collection-daapcollection.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/libamarok_collection-sqlcollection.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/libamarok_massstorage-device.so
--rwxr-xr-x	root/root	opt/kde/lib/libamarok_service_liblastfm.so
 lrwxrwxrwx	root/root	opt/kde/lib/libamaroklib.so -> libamaroklib.so.1
 lrwxrwxrwx	root/root	opt/kde/lib/libamaroklib.so.1 -> libamaroklib.so.1.0.0
 -rwxr-xr-x	root/root	opt/kde/lib/libamaroklib.so.1.0.0
+lrwxrwxrwx	root/root	opt/kde/lib/libamarokocsclient.so -> libamarokocsclient.so.4
+lrwxrwxrwx	root/root	opt/kde/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.3.0
+-rwxr-xr-x	root/root	opt/kde/lib/libamarokocsclient.so.4.3.0
 lrwxrwxrwx	root/root	opt/kde/lib/libamarokpud.so -> libamarokpud.so.1
 lrwxrwxrwx	root/root	opt/kde/lib/libamarokpud.so.1 -> libamarokpud.so.1.0.0
 -rwxr-xr-x	root/root	opt/kde/lib/libamarokpud.so.1.0.0
-lrwxrwxrwx	root/root	opt/kde/lib/libmediadevicelib.so -> libmediadevicelib.so.1
-lrwxrwxrwx	root/root	opt/kde/lib/libmediadevicelib.so.1 -> libmediadevicelib.so.1.0.0
--rwxr-xr-x	root/root	opt/kde/lib/libmediadevicelib.so.1.0.0
 drwxr-xr-x	root/root	opt/kde/lib/strigi/
 -rwxr-xr-x	root/root	opt/kde/lib/strigi/strigita_audible.so
 -rwxr-xr-x	root/root	opt/kde/lib/strigi/strigita_mp4.so
@@ -51,11 +55,12 @@ drwxr-xr-x	root/root	opt/kde/share/apps/
 drwxr-xr-x	root/root	opt/kde/share/apps/amarok/
 drwxr-xr-x	root/root	opt/kde/share/apps/amarok/data/
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/data/DefaultPlaylistLayouts.xml
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/data/InfoAppletCustomStyle.css
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/data/InfoParserLoading.html
--rw-r--r--	root/root	opt/kde/share/apps/amarok/data/ServiceInfoCustomStyle.css
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/data/WikipediaCustomStyle.css
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/data/bullet.gif
--rw-r--r--	root/root	opt/kde/share/apps/amarok/data/service_info_frontpage.html
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/data/hover_info_template.html
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/data/info_frontpage.html
 drwxr-xr-x	root/root	opt/kde/share/apps/amarok/icons/
 drwxr-xr-x	root/root	opt/kde/share/apps/amarok/icons/hicolor/
 drwxr-xr-x	root/root	opt/kde/share/apps/amarok/icons/hicolor/128x128/
@@ -313,6 +318,9 @@ drwxr-xr-x	root/root	opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/icons/hicolor/48x48/actions/view-services-mp3tunes-amarok.png
 drwxr-xr-x	root/root	opt/kde/share/apps/amarok/images/
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/FilenameLayoutDialogHint.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/amarok-videoclip-dailymotion.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/amarok-videoclip-vimeo.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/amarok-videoclip-youtube.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/amarok_icon.svg
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/default-theme-clean.svg
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/emblem-ampache-scalable.svgz
@@ -326,15 +334,29 @@ drwxr-xr-x	root/root	opt/kde/share/apps/amarok/images/
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/emblem-mp3tunes.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/emblem-scripted-scalable.svgz
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/emblem-scripted.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_ampache.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_collections.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_dynamic_playlists.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_files.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_internet.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_jamendo.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_magnatune.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_playlists.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_podcasts.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/hover_info_user_playlists.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/info_frontpage_bg.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/info_frontpage_logo.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/info_frontpage_shadow.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/lastfm-default-cover.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/loading1.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/loading2.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/navigation_arrows.svg
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/nocover.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/opendesktop-22.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/playlist-bookmark-16.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/playlist-layouts-22.png
+-rw-r--r--	root/root	opt/kde/share/apps/amarok/images/playlist-sorting-16.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/pud_items.svg
--rw-r--r--	root/root	opt/kde/share/apps/amarok/images/service_info_frontpage_bg.png
--rw-r--r--	root/root	opt/kde/share/apps/amarok/images/service_info_frontpage_logo.png
--rw-r--r--	root/root	opt/kde/share/apps/amarok/images/service_info_frontpage_shadow.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/service_info_loading1.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/service_info_loading10.png
 -rw-r--r--	root/root	opt/kde/share/apps/amarok/images/service_info_loading11.png
@@ -379,28 +401,30 @@ drwxr-xr-x	root/root	opt/kde/share/apps/desktoptheme/Amarok-Mockup/
 -rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/Amarok-Mockup/colors
 drwxr-xr-x	root/root	opt/kde/share/apps/desktoptheme/Amarok-Mockup/widgets/
 -rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/Amarok-Mockup/widgets/background.svg
--rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/amarok-default.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/Amarok-Mockup/widgets/text-background.svgz
 drwxr-xr-x	root/root	opt/kde/share/apps/desktoptheme/default/
 drwxr-xr-x	root/root	opt/kde/share/apps/desktoptheme/default/widgets/
 -rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-albums.svg
--rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-background.svg
--rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-bookmark.svg
 -rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-currenttrack.svg
--rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-logo.svg
--rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-serviceinfo.svg
--rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-wallpaper.svg
+-rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-info-applet.svg
 -rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
 -rw-r--r--	root/root	opt/kde/share/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
+drwxr-xr-x	root/root	opt/kde/share/apps/solid/
+drwxr-xr-x	root/root	opt/kde/share/apps/solid/actions/
+-rw-r--r--	root/root	opt/kde/share/apps/solid/actions/amarok-play-audiocd.desktop
 drwxr-xr-x	root/root	opt/kde/share/config.kcfg/
 -rw-r--r--	root/root	opt/kde/share/config.kcfg/amarokconfig.kcfg
 drwxr-xr-x	root/root	opt/kde/share/config/
 -rw-r--r--	root/root	opt/kde/share/config/amarok.knsrc
 -rw-r--r--	root/root	opt/kde/share/config/amarok_homerc
+-rw-r--r--	root/root	opt/kde/share/config/amarokapplets.knsrc
 drwxr-xr-x	root/root	opt/kde/share/dbus-1/
 drwxr-xr-x	root/root	opt/kde/share/dbus-1/interfaces/
 -rw-r--r--	root/root	opt/kde/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.player.xml
 -rw-r--r--	root/root	opt/kde/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.root.xml
 -rw-r--r--	root/root	opt/kde/share/dbus-1/interfaces/org.freedesktop.MediaPlayer.tracklist.xml
+-rw-r--r--	root/root	opt/kde/share/dbus-1/interfaces/org.kde.amarok.Collection.xml
+-rw-r--r--	root/root	opt/kde/share/dbus-1/interfaces/org.kde.amarok.SqlCollection.xml
 drwxr-xr-x	root/root	opt/kde/share/icons/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/
 drwxr-xr-x	root/root	opt/kde/share/icons/hicolor/128x128/
@@ -427,30 +451,33 @@ drwxr-xr-x	root/root	opt/kde/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	opt/kde/share/kde4/services/ServiceMenus/amarok_append.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-containment-vertical.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-albums.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-bookmark.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-currenttrack.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-info.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-lyrics.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-mediadevices.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-serviceinfo.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-photos.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-videoclip.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-context-applet-wikipedia.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-current.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-info.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-lyrics.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-service.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-photos.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-videoclip.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-data-engine-wikipedia.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-scriptengine-applet-simple-javascript.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok-scriptengine-runner-javascript.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok.protocol
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_collection-audiocdcollection.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_collection-daapcollection.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_collection-sqlcollection.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_collection-mysqlecollection.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_collection-mysqlservercollection.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_collection-umscollection.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_massstorage-device.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_ampache.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_ampache_config.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_jamendo.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_lastfm.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_lastfm_config.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_magnatunestore.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_magnatunestore_config.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_opmldirectory.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amarok_service_shoutcast.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/amaroklastfm.protocol
 drwxr-xr-x	root/root	opt/kde/share/kde4/servicetypes/
 -rw-r--r--	root/root	opt/kde/share/kde4/servicetypes/amarok_codecinstall.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/servicetypes/amarok_context_applet.desktop
@@ -460,4 +487,6 @@ drwxr-xr-x	root/root	opt/kde/share/locale/
 drwxr-xr-x	root/root	opt/kde/share/locale/fr/
 drwxr-xr-x	root/root	opt/kde/share/locale/fr/LC_MESSAGES/
 -rw-r--r--	root/root	opt/kde/share/locale/fr/LC_MESSAGES/amarok.mo
+-rw-r--r--	root/root	opt/kde/share/locale/fr/LC_MESSAGES/amarok_scriptengine_qscript.mo
 -rw-r--r--	root/root	opt/kde/share/locale/fr/LC_MESSAGES/amarokcollectionscanner_qt.mo
+-rw-r--r--	root/root	opt/kde/share/locale/fr/LC_MESSAGES/amarokpkg.mo
diff --git a/kde/amarok/.md5sum b/kde/amarok/.md5sum
index 14ffe0fa4..83e500c1e 100644
--- a/kde/amarok/.md5sum
+++ b/kde/amarok/.md5sum
@@ -1 +1 @@
-c4ebec02fd1e8b3ef0d7a041726e6780  amarok-2.1.1.tar.bz2
+5a0188c5eb7d343109b82964942d8eb5  amarok-2.2.0.tar.bz2
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index c4c56f78d..0fbafd9af 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: kdebase-runtime, qtscriptgenerator, taglib-extras
 
 name=amarok
-version=2.1.1
+version=2.2.0
 release=1
 source=(http://download.kde.org/download.php?url=stable/$name/$version/src/$name-$version.tar.bz2)