amarok 2.4.0-2 maj

1 files changed, 5 insertions, 23 deletions

diff --git a/kde/amarok/.footprint.i686 b/kde/amarok/.footprint.i686
index 538a30bfe..9bc61910f 100644
--- a/kde/amarok/.footprint.i686
+++ b/kde/amarok/.footprint.i686
@@ -34,9 +34,7 @@ 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_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_massstorage-device.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
@@ -64,6 +62,9 @@ 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/
@@ -82,7 +83,6 @@ 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,7 +166,6 @@ 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
@@ -228,7 +227,6 @@ 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
@@ -298,7 +296,6 @@ 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
@@ -330,7 +327,6 @@ 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
@@ -390,7 +386,6 @@ 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
@@ -413,8 +408,6 @@ 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
@@ -513,9 +506,6 @@ 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
@@ -578,7 +568,6 @@ 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
@@ -635,11 +624,6 @@ 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
@@ -770,9 +754,7 @@ 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_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_massstorage-device.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