amarok, 2.4.90

5 files changed, 68 insertions, 21 deletions

diff --git a/kde/amarok/.footprint.i686 b/kde/amarok/.footprint.i686
index 9bc61910f..538a30bfe 100644
--- a/kde/amarok/.footprint.i686
+++ b/kde/amarok/.footprint.i686
@@ -34,7 +34,9 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_data_engine_tabs.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_data_engine_videoclip.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_data_engine_wikipedia.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_massstorage-device.so
+-rwxr-xr-x	root/root	usr/lib/kde4/amarok_device_massstorage.so
+-rwxr-xr-x	root/root	usr/lib/kde4/amarok_device_nfs.so
+-rwxr-xr-x	root/root	usr/lib/kde4/amarok_device_smb.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_runnerscript_javascript.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_ampache.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_jamendo.so
@@ -62,9 +64,6 @@ lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so -> libamarokpud.so.1
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so.1 -> libamarokpud.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamarokpud.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libamarokqtjson.so -> libamarokqtjson.so.1
-lrwxrwxrwx	root/root	usr/lib/libamarokqtjson.so.1 -> libamarokqtjson.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libamarokqtjson.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libampache_account_login.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
@@ -83,6 +82,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/data/
 -rw-r--r--	root/root	usr/share/apps/amarok/data/first_run_jingle.ogg
 -rw-r--r--	root/root	usr/share/apps/amarok/data/hover_info_template.html
 -rw-r--r--	root/root	usr/share/apps/amarok/data/info_frontpage.html
+-rw-r--r--	root/root	usr/share/apps/amarok/data/podcast_directory.opml
 drwxr-xr-x	root/root	usr/share/apps/amarok/icons/
 drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/128x128/
@@ -166,6 +166,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/remove-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-media-visualization-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-ampache-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-lastfm-amarok.png
@@ -227,6 +228,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/preferences-view-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/remove-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-media-visualization-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-lastfm-amarok.png
@@ -296,6 +298,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/remove-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-media-visualization-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-ampache-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-lastfm-amarok.png
@@ -327,6 +330,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/edit-undo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/emblem-favorite-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-and-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-bpm-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-comment-amarok.png
@@ -386,6 +390,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-lastfm-amarok.png
@@ -408,6 +413,8 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/images/
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-delicious.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-digg.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-facebook.png
+-rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-gpodder-scalable.svgz
+-rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-gpodder.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-identica.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-jamendo-scalable.svgz
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-jamendo.png
@@ -506,6 +513,9 @@ drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/widgets/
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-info-applet.svg
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
+drwxr-xr-x	root/root	usr/share/apps/kconf_update/
+-rwxr-xr-x	root/root	usr/share/apps/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
+-rw-r--r--	root/root	usr/share/apps/kconf_update/amarok.upd
 drwxr-xr-x	root/root	usr/share/apps/solid/
 drwxr-xr-x	root/root	usr/share/apps/solid/actions/
 -rw-r--r--	root/root	usr/share/apps/solid/actions/amarok-play-audiocd.desktop
@@ -568,6 +578,7 @@ drwxr-xr-x	root/root	usr/share/doc/kde/html/en/amarok/
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Folder-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi32-action-collection-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-clear-playlist-amarok.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-edit-playlist-queue.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-media-standard-track-progression-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-music-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-podcast-amarok.png
@@ -624,6 +635,11 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/es/amarok/common -> /usr/share/doc/k
 -rw-r--r--	root/root	usr/share/doc/kde/html/es/amarok/tab_wiki.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/es/amarok/using.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/es/amarok/vis_window.png
+drwxr-xr-x	root/root	usr/share/doc/kde/html/et/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/et/amarok/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/et/amarok/common -> /usr/share/doc/kde/html/et/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/et/amarok/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/et/amarok/index.docbook
 drwxr-xr-x	root/root	usr/share/doc/kde/html/fr/
 drwxr-xr-x	root/root	usr/share/doc/kde/html/fr/amarok/
 -rw-r--r--	root/root	usr/share/doc/kde/html/fr/amarok/advanced.docbook
@@ -754,7 +770,9 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-playdarcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-umscollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-upnpcollection.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_massstorage-device.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/amarok_device_massstorage.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/amarok_device_nfs.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/amarok_device_smb.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_ampache.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_ampache_config.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_jamendo.desktop
diff --git a/kde/amarok/.footprint.x86_64 b/kde/amarok/.footprint.x86_64
index 9bc61910f..538a30bfe 100644
--- a/kde/amarok/.footprint.x86_64
+++ b/kde/amarok/.footprint.x86_64
@@ -34,7 +34,9 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_data_engine_tabs.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_data_engine_videoclip.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_data_engine_wikipedia.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_massstorage-device.so
+-rwxr-xr-x	root/root	usr/lib/kde4/amarok_device_massstorage.so
+-rwxr-xr-x	root/root	usr/lib/kde4/amarok_device_nfs.so
+-rwxr-xr-x	root/root	usr/lib/kde4/amarok_device_smb.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_runnerscript_javascript.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_ampache.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_jamendo.so
@@ -62,9 +64,6 @@ lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so -> libamarokpud.so.1
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so.1 -> libamarokpud.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamarokpud.so.1.0.0
-lrwxrwxrwx	root/root	usr/lib/libamarokqtjson.so -> libamarokqtjson.so.1
-lrwxrwxrwx	root/root	usr/lib/libamarokqtjson.so.1 -> libamarokqtjson.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libamarokqtjson.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libampache_account_login.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
@@ -83,6 +82,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/data/
 -rw-r--r--	root/root	usr/share/apps/amarok/data/first_run_jingle.ogg
 -rw-r--r--	root/root	usr/share/apps/amarok/data/hover_info_template.html
 -rw-r--r--	root/root	usr/share/apps/amarok/data/info_frontpage.html
+-rw-r--r--	root/root	usr/share/apps/amarok/data/podcast_directory.opml
 drwxr-xr-x	root/root	usr/share/apps/amarok/icons/
 drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/128x128/
@@ -166,6 +166,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/remove-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-media-visualization-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-ampache-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/16x16/actions/view-services-lastfm-amarok.png
@@ -227,6 +228,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/preferences-view-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/remove-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-media-visualization-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/22x22/actions/view-services-lastfm-amarok.png
@@ -296,6 +298,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/remove-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-media-visualization-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-ampache-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/32x32/actions/view-services-lastfm-amarok.png
@@ -327,6 +330,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/edit-undo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/emblem-favorite-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-album-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-and-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-artist-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-bpm-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/filename-comment-amarok.png
@@ -386,6 +390,7 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/videoclip-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-media-visualization-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-ampache-amarok.png
+-rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-gpodder-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-jamendo-black-amarok.png
 -rw-r--r--	root/root	usr/share/apps/amarok/icons/hicolor/48x48/actions/view-services-lastfm-amarok.png
@@ -408,6 +413,8 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/images/
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-delicious.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-digg.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-facebook.png
+-rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-gpodder-scalable.svgz
+-rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-gpodder.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-identica.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-jamendo-scalable.svgz
 -rw-r--r--	root/root	usr/share/apps/amarok/images/emblem-jamendo.png
@@ -506,6 +513,9 @@ drwxr-xr-x	root/root	usr/share/apps/desktoptheme/default/widgets/
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-info-applet.svg
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-wikipedia.svg
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/default/widgets/amarok-wikipediaheader.svg
+drwxr-xr-x	root/root	usr/share/apps/kconf_update/
+-rwxr-xr-x	root/root	usr/share/apps/kconf_update/amarok-2.4.1-tokens_syntax_update.pl
+-rw-r--r--	root/root	usr/share/apps/kconf_update/amarok.upd
 drwxr-xr-x	root/root	usr/share/apps/solid/
 drwxr-xr-x	root/root	usr/share/apps/solid/actions/
 -rw-r--r--	root/root	usr/share/apps/solid/actions/amarok-play-audiocd.desktop
@@ -568,6 +578,7 @@ drwxr-xr-x	root/root	usr/share/doc/kde/html/en/amarok/
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Folder-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi32-action-collection-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-clear-playlist-amarok.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-edit-playlist-queue.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-media-standard-track-progression-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-music-amarok.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Hi48-action-podcast-amarok.png
@@ -624,6 +635,11 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/es/amarok/common -> /usr/share/doc/k
 -rw-r--r--	root/root	usr/share/doc/kde/html/es/amarok/tab_wiki.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/es/amarok/using.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/es/amarok/vis_window.png
+drwxr-xr-x	root/root	usr/share/doc/kde/html/et/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/et/amarok/
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/et/amarok/common -> /usr/share/doc/kde/html/et/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/et/amarok/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/et/amarok/index.docbook
 drwxr-xr-x	root/root	usr/share/doc/kde/html/fr/
 drwxr-xr-x	root/root	usr/share/doc/kde/html/fr/amarok/
 -rw-r--r--	root/root	usr/share/doc/kde/html/fr/amarok/advanced.docbook
@@ -754,7 +770,9 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-playdarcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-umscollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-upnpcollection.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_massstorage-device.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/amarok_device_massstorage.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/amarok_device_nfs.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/amarok_device_smb.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_ampache.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_ampache_config.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_jamendo.desktop
diff --git a/kde/amarok/.md5sum.i686 b/kde/amarok/.md5sum.i686
index 36a301873..07697c02a 100644
--- a/kde/amarok/.md5sum.i686
+++ b/kde/amarok/.md5sum.i686
@@ -1,2 +1,2 @@
-bdb6ddc8e38d0982a0786ff8ac96d923  amarok-2.4.0.tar.bz2
+b32cf034fb4bdcfcff75fae70d43caa9  amarok-2.4.0.90.tar.bz2
 5595074ec080ede76f366496f4fc0ff7  splash_screen.jpg
diff --git a/kde/amarok/.md5sum.x86_64 b/kde/amarok/.md5sum.x86_64
index 36a301873..07697c02a 100644
--- a/kde/amarok/.md5sum.x86_64
+++ b/kde/amarok/.md5sum.x86_64
@@ -1,2 +1,2 @@
-bdb6ddc8e38d0982a0786ff8ac96d923  amarok-2.4.0.tar.bz2
+b32cf034fb4bdcfcff75fae70d43caa9  amarok-2.4.0.90.tar.bz2
 5595074ec080ede76f366496f4fc0ff7  splash_screen.jpg
diff --git a/kde/amarok/Pkgfile b/kde/amarok/Pkgfile
index a03d9d57b..03fc8e0dc 100755
--- a/kde/amarok/Pkgfile
+++ b/kde/amarok/Pkgfile
@@ -2,25 +2,36 @@
 # URL: http://amarok.kde.org/fr
 # Maintainer: NuTyX packager team
 # Packager: lesibel at free dot fr
-# Depends on:  kdelibs, cmake, mysql, qtscriptgenerator, taglib, taglib-extras, libmtp, loudmouth, libvisual, docbook-xsl, liblastfm
+# Depends on:  kdelibs, cmake, mysql, qtscriptgenerator, taglib, taglib-extras, libmtp, loudmouth, libvisual, docbook-xsl, liblastfm, qjson
 # Run on: kdebase-runtime,mysql,qtscriptgenerator,taglib-extras,libmtp,loudmouth
 
 name=amarok
-version=2.4.0
-release=2
-source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2
+version=2.4.0.90
+release=1
+source=(ftp://kde.mirrors.pair.com/unstable/$name/$version/src/$name-$version.tar.bz2
 	http://nutyx.meticul.eu/files/patchs/$name/splash_screen.jpg
         )
 
-build() {
+build() {    
 	cd $name-$version
 
 	mkdir build
         cd build
-        cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
-		  -DCMAKE_BUILD_TYPE=Release \
-		  -DCMAKE_SKIP_RPATH=ON \
-		  -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
+	cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
+                 -DCMAKE_BUILD_TYPE=Release \
+                 -DCMAKE_SKIP_RPATH=ON \
+		 -DWITH_PLAYER=ON \
+		 -DWITH_Libgcrypt=OFF \
+		 -DWITH_MYSQL_EMBEDDED=YES
+
+#        cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
+#		  -DCMAKE_BUILD_TYPE=Release \
+#		  -DCMAKE_SKIP_RPATH=ON \
+#		  -DSYSCONF_INSTALL_DIR=/etc/kde \
+#                 -DKDE_DEFAULT_HOME='.kde' 
+#		  -DWITH_Libgcrypt=OFF \
+#		  -DWITH_MYSQL_EMBEDDED=ON \
+#		  -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
 	make
 	make DESTDIR=$PKG install
 	install -m644 $SRC/splash_screen.jpg $PKG//usr/share/apps/amarok/images/splash_screen.jpg