- update to -> 1.4.2

- distfiles now lives at Ktown
- We now support libtunepimp-0.5
- add 1.4.2-patchset1 from author(s); fixing collectionscanner restart
  and audio-cd playback

9 files changed, 200 insertions, 138 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index c12ffbf77105..5a0557c923ad 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	1.4.1
+PORTVERSION=	1.4.2
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
 
 MAINTAINER=	mich@FreeBSD.org
 COMMENT=	Media player for KDE
 
 LIB_DEPENDS=	tag.5:${PORTSDIR}/audio/taglib \
-		tunepimp.3:${PORTSDIR}/audio/libtunepimp-old \
+		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
 		mp4v2:${PORTSDIR}/multimedia/mpeg4ip-libmp4v2 \
 		xine.15:${PORTSDIR}/multimedia/libxine
 
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index f8c12e83f137..d64c6cee75d3 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,3 +1,3 @@
-MD5 (amarok-1.4.1.tar.bz2) = 4ed6e766541c4227d1d8c8eb93d0b891
-SHA256 (amarok-1.4.1.tar.bz2) = dbe4397d041a77f7ded063f50d5cfd2faf0e9efce9b4483589f751c20ff89ccd
-SIZE (amarok-1.4.1.tar.bz2) = 13509939
+MD5 (amarok-1.4.2.tar.bz2) = a1e5aac4294eb049021d1e2889c0d214
+SHA256 (amarok-1.4.2.tar.bz2) = 4b0b3174edf30c1d78240f7a48aeda1d7d9763a18de409046ef426caa3f6fd82
+SIZE (amarok-1.4.2.tar.bz2) = 17080668
diff --git a/audio/amarok/files/patch-amarok_src_atomicstring.cpp b/audio/amarok/files/patch-amarok_src_atomicstring.cpp
deleted file mode 100644
index f5d75dc6ddd5..000000000000
--- a/audio/amarok/files/patch-amarok_src_atomicstring.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/atomicstring.cpp.orig
-+++ amarok/src/atomicstring.cpp
-@@ -17,13 +17,13 @@
-   Boston, MA 02110-1301, USA.
- */
- 
--#include <stdint.h>
-+#include <inttypes.h>
- #include <qdeepcopy.h>
- #include <qstring.h>
- 
- #include "atomicstring.h"
- 
--#ifdef __GNUC__
-+#if __GNUC__ >= 3
- 
-     // Golden ratio - arbitrary start value to avoid mapping all 0's to all 0's
-     // or anything like that.
-@@ -80,16 +80,6 @@
-         bool operator()( const QString *a, const QString *b ) const
-         {
-             return *a == *b;
--        }
--    };
--
--#else
--
--    struct AtomicString::less
--    {
--        bool operator()( const QString *a, const QString *b ) const
--        {
--            return *a < *b;
-         }
-     };
- 
diff --git a/audio/amarok/files/patch-amarok_src_atomicstring.h b/audio/amarok/files/patch-amarok_src_atomicstring.h
deleted file mode 100644
index 1027e66247fe..000000000000
--- a/audio/amarok/files/patch-amarok_src_atomicstring.h
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/atomicstring.h.orig
-+++ amarok/src/atomicstring.h
-@@ -34,7 +34,7 @@
- #define AMAROK_ATOMICSTRING_H
- 
- #include "config.h"
--#ifdef __GNUC__
-+#if __GNUC__ >= 3
-     #include <ext/hash_set>
- #else
-     #include <set>
-@@ -136,12 +136,18 @@
-     uint refcount() const;
- 
- private:
--    #ifdef __GNUC__
-+    #if __GNUC__ >= 3
-         struct SuperFastHash;
-         struct equal;
-         typedef __gnu_cxx::hash_set<QString*, SuperFastHash, equal> set_type;
-     #else
--        struct less;
-+	struct less
-+	{
-+	bool operator()( const QString *a, const QString *b ) const
-+	{
-+	return *a < *b;
-+	}
-+	};
-         typedef std::set<QString*, less> set_type;
-     #endif
- 
diff --git a/audio/amarok/files/patch-amarok_src_collectiondb.cpp b/audio/amarok/files/patch-amarok_src_collectiondb.cpp
new file mode 100644
index 000000000000..81649997cb8f
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_collectiondb.cpp
@@ -0,0 +1,70 @@
+
+$FreeBSD$
+
+--- amarok/src/collectiondb.cpp.orig
++++ amarok/src/collectiondb.cpp
+@@ -3447,28 +3447,6 @@
+             bundle->copyFrom( peb );
+             valid = true;
+         }
+-        else if( bundle->url().protocol() == "audiocd" || bundle->url().protocol() == "cdda" )
+-        {
+-            // try to see if the engine has some info about the
+-            // item (the intended behaviour should be that if the
+-            // item is an AudioCD track, the engine can return
+-            // CDDB data for it)
+-            Engine::SimpleMetaBundle smb;
+-            if ( EngineController::engine()->metaDataForUrl( bundle->url(), smb ) )
+-            {
+-                valid = true;
+-                bundle->setTitle( smb.title );
+-                bundle->setArtist( smb.artist );
+-                bundle->setAlbum( smb.album );
+-                bundle->setComment( smb.comment );
+-                bundle->setGenre( smb.genre );
+-                bundle->setBitrate( smb.bitrate.toInt() );
+-                bundle->setSampleRate( smb.samplerate.toInt() );
+-                bundle->setLength( smb.length.toInt() );
+-                bundle->setYear( smb.year.toInt() );
+-                bundle->setTrack( smb.tracknr.toInt() );
+-            }
+-        }
+     }
+ 
+     return valid;
+@@ -5745,7 +5723,8 @@
+ {
+ 
+     QStringList values;
+-    int error, rc;
++    int error;
++    int rc = 0;
+     const char* tail;
+     sqlite3_stmt* stmt;
+     int busyCnt = 0;
+@@ -5771,6 +5750,7 @@
+             Debug::error() << sqlite3_errmsg( m_db ) << endl;
+             Debug::error() << "on query: " << statement << endl;
+             values = QStringList();
++            break;
+         }
+         else
+         {
+@@ -5835,7 +5815,8 @@
+ 
+ int SqliteConnection::insert( const QString& statement, const QString& /* table */ )
+ {
+-    int error, rc;
++    int error;
++    int rc = 0;
+     const char* tail;
+     sqlite3_stmt* stmt;
+     int busyCnt = 0;
+@@ -5860,6 +5841,7 @@
+             Debug::error() << k_funcinfo << " sqlite3_compile error:" << endl;
+             Debug::error() << sqlite3_errmsg( m_db ) << endl;
+             Debug::error() << "on insert: " << statement << endl;
++            break;
+         }
+         else
+         {
diff --git a/audio/amarok/files/patch-amarok_src_mediabrowser.h b/audio/amarok/files/patch-amarok_src_mediabrowser.h
deleted file mode 100644
index 58438b58b1f9..000000000000
--- a/audio/amarok/files/patch-amarok_src_mediabrowser.h
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/mediabrowser.h.orig
-+++ amarok/src/mediabrowser.h
-@@ -19,11 +19,11 @@
- #include <kurl.h>            //stack allocated
- #include <kio/global.h>      //filesize_t
- #include "scrobbler.h"       //SubmitItem
-+#include "metabundle.h"
- 
- class MediaBrowser;
- class MediaDevice;
- class MediaView;
--class MetaBundle;
- class SpaceLabel;
- class TransferDialog;
- 
diff --git a/audio/amarok/files/patch-amarok_src_mediadevice_ipod_ipodmediadevice.cpp b/audio/amarok/files/patch-amarok_src_mediadevice_ipod_ipodmediadevice.cpp
deleted file mode 100644
index b1b831fa2d11..000000000000
--- a/audio/amarok/files/patch-amarok_src_mediadevice_ipod_ipodmediadevice.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- amarok/src/mediadevice/ipod/ipodmediadevice.cpp.orig
-+++ amarok/src/mediadevice/ipod/ipodmediadevice.cpp
-@@ -46,6 +46,7 @@
- #endif
- 
- #include <cstdlib>
-+#include <unistd.h>
- 
- 
- // disable if it takes too long for you
diff --git a/audio/amarok/files/patch-amarok_src_scancontroller.h b/audio/amarok/files/patch-amarok_src_scancontroller.h
new file mode 100644
index 000000000000..369f768096c7
--- /dev/null
+++ b/audio/amarok/files/patch-amarok_src_scancontroller.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- amarok/src/scancontroller.h.orig
++++ amarok/src/scancontroller.h
+@@ -99,7 +99,7 @@
+         void customEvent( QCustomEvent* );
+ 
+         // Member variables:
+-        static const uint MAX_RESTARTS = 2;
++        static const uint MAX_RESTARTS = 20;
+ 
+         KProcIO* m_scanner;
+         QStringList m_folders;
diff --git a/audio/amarok/pkg-plist b/audio/amarok/pkg-plist
index 21ae5c037e4b..4d4db50491df 100644
--- a/audio/amarok/pkg-plist
+++ b/audio/amarok/pkg-plist
@@ -1,6 +1,7 @@
 bin/amarok
 bin/amarokapp
 bin/amarokcollectionscanner
+bin/amarok_daapserver.rb
 bin/amarok_proxy.rb
 lib/libamarok.so
 lib/libamarok.so.0
@@ -10,6 +11,18 @@ lib/libamarok.la
 lib/kde3/konqsidebar_universalamarok.a
 lib/kde3/konqsidebar_universalamarok.la
 lib/kde3/konqsidebar_universalamarok.so
+lib/kde3/libamarok_daap-mediadevice.so
+lib/kde3/libamarok_daap-mediadevice.la
+lib/kde3/libamarok_daap-mediadevice.a
+lib/kde3/libamarok_massstorage-device.so
+lib/kde3/libamarok_massstorage-device.la
+lib/kde3/libamarok_massstorage-device.a
+lib/kde3/libamarok_nfs-device.so
+lib/kde3/libamarok_nfs-device.la
+lib/kde3/libamarok_nfs-device.a
+lib/kde3/libamarok_smb-device.so
+lib/kde3/libamarok_smb-device.la
+lib/kde3/libamarok_smb-device.a
 %%GPOD%%lib/kde3/libamarok_ipod-mediadevice.so
 %%GPOD%%lib/kde3/libamarok_ipod-mediadevice.la
 %%GPOD%%lib/kde3/libamarok_ipod-mediadevice.a
@@ -411,7 +424,6 @@ share/apps/amarok/images/eq_inactive2.png
 share/apps/amarok/images/lastfm.png
 share/apps/amarok/images/loading1.png
 share/apps/amarok/images/loading2.png
-share/apps/amarok/images/logo_web.png
 share/apps/amarok/images/menu_sidepixmap.png
 share/apps/amarok/images/more_albums.png
 share/apps/amarok/images/musicbrainz.png
@@ -433,6 +445,7 @@ share/apps/amarok/images/volumeslider-handle_glow.png
 share/apps/amarok/images/wizard_compact.png
 share/apps/amarok/images/wizard_xmms.png
 share/apps/amarok/images/xine_logo.png
+share/apps/amarok/ruby_lib/codes.rb
 share/apps/amarok/scripts/common/Publisher.py
 share/apps/amarok/scripts/common/Zeroconf.py
 share/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -587,37 +600,46 @@ share/doc/HTML/en/amarok/tab_music.png
 share/doc/HTML/en/amarok/tab_wiki.png
 share/doc/HTML/en/amarok/using.docbook
 share/doc/HTML/en/amarok/vis_window.png
-share/doc/HTML/es/amarok/media_device.png
+share/doc/HTML/es/amarok/add_dynamic.png
+share/doc/HTML/es/amarok/amarok_playlist.png
+share/doc/HTML/es/amarok/analyzer.png
+share/doc/HTML/es/amarok/browser_choice.png
 share/doc/HTML/es/amarok/buttons.png
+share/doc/HTML/es/amarok/collection.png
+share/doc/HTML/es/amarok/config_appearance.png
 share/doc/HTML/es/amarok/config_collection.png
-share/doc/HTML/es/amarok/script_manager.png
-share/doc/HTML/es/amarok/logo.png
-share/doc/HTML/es/amarok/play_list.png
-share/doc/HTML/es/amarok/equalizer.png
-share/doc/HTML/es/amarok/config_scrobbler.png
+share/doc/HTML/es/amarok/config_engine.png
 share/doc/HTML/es/amarok/config_general.png
-share/doc/HTML/es/amarok/rmb_menu.png
-share/doc/HTML/es/amarok/status_bar.png
-share/doc/HTML/es/amarok/pl_tip1.png
-share/doc/HTML/es/amarok/dynamic_mode1.png
-share/doc/HTML/es/amarok/dynamic_mode2.png
-share/doc/HTML/es/amarok/coverman.png
 share/doc/HTML/es/amarok/config_osd.png
 share/doc/HTML/es/amarok/config_playback.png
-share/doc/HTML/es/amarok/pl_browser.png
-share/doc/HTML/es/amarok/queue_manager.png
-share/doc/HTML/es/amarok/quick.docbook
-share/doc/HTML/es/amarok/player_window.png
+share/doc/HTML/es/amarok/config_scrobbler.png
+share/doc/HTML/es/amarok/context.png
+share/doc/HTML/es/amarok/coverman.png
+share/doc/HTML/es/amarok/dynamic_bar.png
+share/doc/HTML/es/amarok/dynamic_mode1.png
+share/doc/HTML/es/amarok/dynamic_mode2.png
+share/doc/HTML/es/amarok/dynamic_settings.png
+share/doc/HTML/es/amarok/equalizer.png
 share/doc/HTML/es/amarok/file_browser.png
+share/doc/HTML/es/amarok/logo.png
+share/doc/HTML/es/amarok/media_device.png
+share/doc/HTML/es/amarok/menubar.png
 share/doc/HTML/es/amarok/musicbrainz.png
-share/doc/HTML/es/amarok/context.png
-share/doc/HTML/es/amarok/analyzer.png
-share/doc/HTML/es/amarok/config_appearance.png
+share/doc/HTML/es/amarok/pl_browser.png
+share/doc/HTML/es/amarok/pl_tip1.png
+share/doc/HTML/es/amarok/play_list.png
+share/doc/HTML/es/amarok/player_window.png
+share/doc/HTML/es/amarok/playlist_browser.png
 share/doc/HTML/es/amarok/playlist_window.png
+share/doc/HTML/es/amarok/queue_manager.png
+share/doc/HTML/es/amarok/quick.docbook
+share/doc/HTML/es/amarok/rmb_menu.png
+share/doc/HTML/es/amarok/script_manager.png
+share/doc/HTML/es/amarok/status_bar.png
+share/doc/HTML/es/amarok/tab_lyrics.png
+share/doc/HTML/es/amarok/tab_music.png
+share/doc/HTML/es/amarok/tab_wiki.png
 share/doc/HTML/es/amarok/vis_window.png
-share/doc/HTML/es/amarok/menubar.png
-share/doc/HTML/es/amarok/config_engine.png
-share/doc/HTML/es/amarok/collection.png
 share/doc/HTML/et/amarok/advanced.docbook
 share/doc/HTML/et/amarok/common
 share/doc/HTML/et/amarok/config.docbook
@@ -677,6 +699,7 @@ share/doc/HTML/it/amarok/pl_tip1.png
 share/doc/HTML/it/amarok/play_list.png
 share/doc/HTML/it/amarok/player_window.png
 share/doc/HTML/it/amarok/playlist_browser.png
+share/doc/HTML/it/amarok/playlist_window.png
 share/doc/HTML/it/amarok/plugin.docbook
 share/doc/HTML/it/amarok/queue_manager.png
 share/doc/HTML/it/amarok/quick.docbook
@@ -684,8 +707,13 @@ share/doc/HTML/it/amarok/requirements.docbook
 share/doc/HTML/it/amarok/rmb_menu.png
 share/doc/HTML/it/amarok/script_manager.png
 share/doc/HTML/it/amarok/status_bar.png
+share/doc/HTML/it/amarok/tab_lyrics.png
+share/doc/HTML/it/amarok/tab_music.png
+share/doc/HTML/it/amarok/tab_wiki.png
 share/doc/HTML/it/amarok/using.docbook
 share/doc/HTML/it/amarok/vis_window.png
+share/doc/HTML/nl/amarok/add_dynamic.png
+share/doc/HTML/nl/amarok/amarok_playlist.png
 share/doc/HTML/nl/amarok/advanced.docbook
 share/doc/HTML/nl/amarok/analyzer.png
 share/doc/HTML/nl/amarok/buttons.png
@@ -694,9 +722,7 @@ share/doc/HTML/nl/amarok/common
 share/doc/HTML/nl/amarok/config.docbook
 share/doc/HTML/nl/amarok/config_appearance.png
 share/doc/HTML/nl/amarok/config_collection.png
-share/doc/HTML/nl/amarok/config_colors.png
 share/doc/HTML/nl/amarok/config_engine.png
-share/doc/HTML/nl/amarok/config_fonts.png
 share/doc/HTML/nl/amarok/config_general.png
 share/doc/HTML/nl/amarok/config_osd.png
 share/doc/HTML/nl/amarok/config_playback.png
@@ -704,6 +730,7 @@ share/doc/HTML/nl/amarok/config_scrobbler.png
 share/doc/HTML/nl/amarok/context.png
 share/doc/HTML/nl/amarok/coverman.png
 share/doc/HTML/nl/amarok/develop.docbook
+share/doc/HTML/nl/amarok/dynamic_bar.png
 share/doc/HTML/nl/amarok/equalizer.png
 share/doc/HTML/nl/amarok/faq.docbook
 share/doc/HTML/nl/amarok/feature_guide.docbook
@@ -716,29 +743,75 @@ share/doc/HTML/nl/amarok/menubar.png
 share/doc/HTML/nl/amarok/pl_browser.png
 share/doc/HTML/nl/amarok/pl_tip1.png
 share/doc/HTML/nl/amarok/play_list.png
+share/doc/HTML/nl/amarok/playlist_browser.png
 share/doc/HTML/nl/amarok/player_window.png
 share/doc/HTML/nl/amarok/playlist_window.png
 share/doc/HTML/nl/amarok/plugin.docbook
+share/doc/HTML/nl/amarok/queue_manager.png
 share/doc/HTML/nl/amarok/quick.docbook
 share/doc/HTML/nl/amarok/requirements.docbook
 share/doc/HTML/nl/amarok/rmb_menu.png
-share/doc/HTML/nl/amarok/search.png
+share/doc/HTML/nl/amarok/script_manager.png
 share/doc/HTML/nl/amarok/status_bar.png
+share/doc/HTML/nl/amarok/tab_lyrics.png
+share/doc/HTML/nl/amarok/tab_lyrics1.png
+share/doc/HTML/nl/amarok/tab_music.png
+share/doc/HTML/nl/amarok/tab_wiki.png
 share/doc/HTML/nl/amarok/using.docbook
 share/doc/HTML/nl/amarok/vis_window.png
+share/doc/HTML/pl/amarok/requirements.docbook
+share/doc/HTML/pl/amarok/advanced.docbook
+share/doc/HTML/pl/amarok/config.docbook
+share/doc/HTML/pl/amarok/using.docbook
+share/doc/HTML/pl/amarok/faq.docbook
+share/doc/HTML/pl/amarok/index.docbook
+share/doc/HTML/pl/amarok/quick.docbook
+share/doc/HTML/pl/amarok/index.cache.bz2
+share/doc/HTML/pl/amarok/common
+share/doc/HTML/pt/amarok/add_dynamic.png
 share/doc/HTML/pt/amarok/advanced.docbook
+share/doc/HTML/pt/amarok/amarok_playlist.png
+share/doc/HTML/pt/amarok/analyzer.png
+share/doc/HTML/pt/amarok/buttons.png
+share/doc/HTML/pt/amarok/collection.png
 share/doc/HTML/pt/amarok/common
 share/doc/HTML/pt/amarok/config.docbook
+share/doc/HTML/pt/amarok/config_appearance.png
+share/doc/HTML/pt/amarok/config_collection.png
+share/doc/HTML/pt/amarok/config_engine.png
+share/doc/HTML/pt/amarok/config_general.png
+share/doc/HTML/pt/amarok/config_osd.png
+share/doc/HTML/pt/amarok/config_playback.png
+share/doc/HTML/pt/amarok/config_scrobbler.png
+share/doc/HTML/pt/amarok/coverman.png
 share/doc/HTML/pt/amarok/develop.docbook
+share/doc/HTML/pt/amarok/dynamic_bar.png
+share/doc/HTML/pt/amarok/dynamic_settings.png
+share/doc/HTML/pt/amarok/equalizer.png
 share/doc/HTML/pt/amarok/faq.docbook
 share/doc/HTML/pt/amarok/feature_guide.docbook
+share/doc/HTML/pt/amarok/file_browser.png
 share/doc/HTML/pt/amarok/hidden.docbook
 share/doc/HTML/pt/amarok/index.cache.bz2
 share/doc/HTML/pt/amarok/index.docbook
+share/doc/HTML/pt/amarok/logo.png
+share/doc/HTML/pt/amarok/media_device.png
+share/doc/HTML/pt/amarok/menubar.png
+share/doc/HTML/pt/amarok/musicbrainz.png
+share/doc/HTML/pt/amarok/pl_tip1.png
+share/doc/HTML/pt/amarok/play_list.png
+share/doc/HTML/pt/amarok/player_window.png
+share/doc/HTML/pt/amarok/playlist_browser.png
+share/doc/HTML/pt/amarok/playlist_window.png
 share/doc/HTML/pt/amarok/plugin.docbook
+share/doc/HTML/pt/amarok/queue_manager.png
 share/doc/HTML/pt/amarok/quick.docbook
 share/doc/HTML/pt/amarok/requirements.docbook
+share/doc/HTML/pt/amarok/rmb_menu.png
+share/doc/HTML/pt/amarok/script_manager.png
+share/doc/HTML/pt/amarok/status_bar.png
 share/doc/HTML/pt/amarok/using.docbook
+share/doc/HTML/pt/amarok/vis_window.png
 share/doc/HTML/pt_BR/amarok/advanced.docbook
 share/doc/HTML/pt_BR/amarok/common
 share/doc/HTML/pt_BR/amarok/config.docbook
@@ -838,6 +911,7 @@ 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/locale/af/LC_MESSAGES/amarok.mo
 share/locale/az/LC_MESSAGES/amarok.mo
 share/locale/bg/LC_MESSAGES/amarok.mo
 share/locale/br/LC_MESSAGES/amarok.mo
@@ -888,10 +962,16 @@ share/locale/uz/LC_MESSAGES/amarok.mo
 share/locale/zh_CN/LC_MESSAGES/amarok.mo
 share/locale/zh_TW/LC_MESSAGES/amarok.mo
 %%GPOD%%share/services/amarok_ipod-mediadevice.desktop
+share/services/amarokitpc.protocol
+share/services/amaroklastfm.protocol
+share/services/amarokpcast.protocol
+share/services/amarok_daap-mediadevice.desktop
 share/services/amarok_generic-mediadevice.desktop
+share/services/amarok_massstorage-device.desktop
+share/services/amarok_nfs-device.desktop
+share/services/amarok_smb-device.desktop
 share/services/amarok_xine-engine.desktop
 share/services/amarok_void-engine_plugin.desktop
-share/services/lastfm.protocol
 share/servicetypes/amarok_codecinstall.desktop
 share/servicetypes/amarok_plugin.desktop
 @dirrmtry share/locale/km/LC_MESSAGES
@@ -930,6 +1010,7 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/doc/HTML/ru/amarok
 @dirrm share/doc/HTML/pt_BR/amarok
 @dirrm share/doc/HTML/pt/amarok
+@dirrm share/doc/HTML/pl/amarok
 @dirrm share/doc/HTML/nl/amarok
 @dirrm share/doc/HTML/it/amarok
 @dirrm share/doc/HTML/fr/amarok
@@ -952,6 +1033,7 @@ share/servicetypes/amarok_plugin.desktop
 @dirrm share/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/apps/amarok/scripts/common
 @dirrm share/apps/amarok/scripts
+@dirrm share/apps/amarok/ruby_lib
 @dirrm share/apps/amarok/images
 @dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
 @dirrm share/apps/amarok/icons/crystalsvg/64x64