Update to 1.4.1:

VERSION 1.4.1:
  FEATURES:
    * Support for last.fm streams. (BR 111983)
    * New playlist toolbar menu entry for adding streams to the playlist.
      (BR 129349)

  CHANGES:
    * Upgraded internal SQLite to 3.3.6.
    * Inotify support disabled for now, due to stability issues.
    * Tag editor is no longer modal.
    * Provide warning dialog when deleting items from the playlistbrowser.
      (BR 129313)
    * GUI layout reverted to the classic Amarok layout.
    * The Extended Info panel in the playlistbrowser is now resizeable.

  BUGFIXES:
    * Pressing return in the search bar of the Collection Browser immediately
      after typing a query no longer appends the wrong items to the playlist.
    * Fix crash when pressing Back or Forward buttons multiple times quickly
      in Artist tab. Patch by Thomas Lindroth
    * Fix problems where blanks would be added to data if SQLite was busy.
      Patch by Thomas Lindroth
    * Automatically refresh stream lyrics on new metadata.
    * Set half star ratings on multiple selected tracks when clicking on an
      item. (BR 129449)
    * Only enable Show Extended Info in the Playlist Browser when information
      is available. (BR 126590)
    * Disable global shortcut for ratings when ratings are disabled.
      (BR 129414)
    * Autodetect button in Media Devices configuration dialog would not
      properly signal changes, so that new devices were not always saved.


VERSION 1.4.1-beta1:
  FEATURES:
    * Much improved and completed custom icon theme by Vadim Petrunin
    * LibVisual 0.4 supported and required.
    * Support for custom scoring algorithms, via scripts.
    * Creative Nomad Jukebox support (untested!). Submitted by Andres Oton
    * Inotify support. On kernels 2.6.13 and above with Inotify support
      compiled in, the collection will automatically be rescanned and
      updated as soon as a watched folder has changed.

  CHANGES:
    * First-run wizard can no longer be restarted from the application menu.
      However, it can still be invoked with "amarok --wizard".
    * Astraweb lyrics script was removed for being crappy and unmaintained. If
      you want to maintain it, grab it from SVN and release on kde-apps.org.
    * "Append Count" option of dynamic playlists has been removed. It is
      now always one. (BR 120044)
    * Context browser can now play/queue specific discs of an album or
      compilation.
    * Automatically imported playlists go into a separate category.
    * Block quitting amaroK until all on-going media device operations have
      finished with a consistent state.
    * Interface choice in wizard removed.
    * MoodBar has been removed. The maintainer has not been updating it, and
      it was causing crashes for many people.
    * Usability improvements for the Script Manager, including a tree view.
    * Use KMimeType for resolving file type for metadata acquisition before
      falling back to extension based guessing.
    * Removed the "detailed mode" in the playlist-browser.
    * Also copy non-local URLs to collection when dropped onto collection
      browser.
    * Speed up connecting media devices with a lot of tracks to be submitted
      to last.fm.
    * For media without metadata, try to read metadata after transfer to
      the iPod (e.g. when copying an audio CD via KIOslaves).
    * Hint at starting a transcode script for transcoding while transferring
      to media devices. (BR 127155)
    * If a disc number is present, append it to the album's name when
      organizing files. (BR 126867)
    * Configure, which of fresh podcasts, newest & favorite albums are shown
      in context browser home view. Patch by Patrick Muench
      (BR 127043)
    * Dynamic mode no longer skips to the next song if you press play (via
      dcop, for instance) while already playing a track. Instead it restarts
      the current one.
    * The Actions menu has been renamed the Engage menu. It's way cooler,
      right? I mean, Star Trek is really cool, right?
    * Multiple podcasts can be configured at once by selecting multiple channels
      or by configuring the children of a folder.

  BUGFIXES:
    * Allow dropping of tracks after non-existant items in the playlist.
    * Make changes to the default dynamic playlists persistent.
    * Send UTF-8 encoded requests to Wikipedia. Thanks to Thomas Lindroth
      for the patch. (BR 127654)
    * Correctly restore podcast channel title when fetching fails.
    * Show error message when xine mp3 decoder isn't installed, don't just
      play next track.
    * Properly render and optimise playlist loading icons.
    * Properly import and export XSPF playlist formats.
    * Optimise addition of playlists to the playlistbrowser.
    * In context browser, show localized date for podcasts. (BR 127853)
    * Regression in dynamic mode caused it to skip the first track in the
      playlist whenever it was started. (BR 127451)
    * Stop Playing after Track: remember current track (BR 127312)
    * Radio streams were broken for protocols other than HTTP. (BR 127848)
    * Collection Browser would not set/unset/burn albums with ', The' in
      their name.
    * Prevent breakage when xine couldn't initialize the audio device. Patch
      from Ilya Konstantinov
    * Allow for recognition of the webdav protocol. Patch by Ilya
      Konstantinov
    * Setting a rating on an unplayed track would affect score generated.
      Patch by Patrick Muench
    * Stop tags with different capitalisation being treated as the same
      when building the collection.
    * Make database connections actually get closed when no longer used.
      (BR 123113)
    * xine engine would truncate the last seconds of a track, if no other
      track followed in the playlist.
    * Fixed AudioCD playback with xine-engine. Patch by Markus Kaufhold
    * If dynamic mode was turned on and then off, the previous random and
      repeat modes would be forgotten. (BR 123743)
    * Removing the current track through DCOP while editing a field of the
      track in the playlist would cause a crash. (BR 119152)
    * Make characters encoded with % (such as a forward slash, %2f) display
      correctly. (BR 105266)

3 files changed, 254 insertions, 39 deletions

diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 8d475a7e06b..043c66d633a 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2006/07/04 00:58:50 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2006/07/04 06:45:15 wiz Exp $
 
-DISTNAME=		amarok-1.4.0a
-PKGREVISION=		2
+DISTNAME=		amarok-1.4.1
 CATEGORIES=		audio kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=amarok/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,7 +9,6 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://amarok.kde.org/
 COMMENT=		KDE audio player
 
-WRKSRC=			${WRKDIR}/amarok-1.4.0
 USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake pkg-config msgfmt
 USE_LANGUAGES=		c c++
@@ -26,7 +24,6 @@ CONFIGURE_ARGS+=	--with-mp4v2-dir=${LOCALBASE}
 LIBS+=			${LIBOSSAUDIO}
 
 PYTHON_PATCH_SCRIPTS= \
-	amarok/src/scripts/amarok_live/amarok_live.py \
 	amarok/src/scripts/common/Publisher.py \
 	amarok/src/scripts/common/Zeroconf.py \
 	amarok/src/scripts/playlist2html/Playlist.py \
@@ -41,9 +38,12 @@ PYTHON_PATCH_SCRIPTS= \
 	amarok/src/scripts/webcontrol/WebControl.py \
 	amarok/src/scripts/webcontrol/WebPublisher.py
 REPLACE_RUBY= \
+	amarok/src/amarok_proxy.rb \
 	amarok/src/scripts/lyrics_astraweb/lyrics_astraweb.rb \
 	amarok/src/scripts/lyrics_lyrc/lyrics_lyrc.rb \
 	amarok/src/scripts/ruby_debug/debug.rb \
+	amarok/src/scripts/score_default/score_default.rb \
+	amarok/src/scripts/score_impulsive/score_impulsive.rb \
 	amarok/src/scripts/templates/amarok.rb \
 	amarok/src/scripts/templates/ruby_qt_template.rb
 
diff --git a/audio/amarok/PLIST b/audio/amarok/PLIST
index 66c420b1a26..cfc629da88d 100644
--- a/audio/amarok/PLIST
+++ b/audio/amarok/PLIST
@@ -1,20 +1,15 @@
-@comment $NetBSD: PLIST,v 1.16 2006/05/31 17:59:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/07/04 06:45:15 wiz Exp $
 bin/amarok
 bin/amarok_libvisual
+bin/amarok_proxy.rb
 bin/amarok_xmmswrapper2
 bin/amarokapp
 bin/amarokcollectionscanner
 lib/kde3/konqsidebar_universalamarok.la
-lib/kde3/libamarok_generic-mediadevice.a
 lib/kde3/libamarok_generic-mediadevice.la
-lib/kde3/libamarok_generic-mediadevice.so
 lib/kde3/libamarok_void-engine_plugin.la
 lib/kde3/libamarok_xine-engine.la
-lib/libamarok.a
 lib/libamarok.la
-lib/libamarok.so
-lib/libamarok.so.0
-lib/libamarok.so.0.0.0
 share/applications/kde/amarok.desktop
 share/doc/kde/HTML/da/amarok/advanced.docbook
 share/doc/kde/HTML/da/amarok/common
@@ -251,15 +246,6 @@ share/doc/kde/HTML/nl/amarok/search.png
 share/doc/kde/HTML/nl/amarok/status_bar.png
 share/doc/kde/HTML/nl/amarok/using.docbook
 share/doc/kde/HTML/nl/amarok/vis_window.png
-share/doc/kde/HTML/pl/amarok/advanced.docbook
-share/doc/kde/HTML/pl/amarok/common
-share/doc/kde/HTML/pl/amarok/config.docbook
-share/doc/kde/HTML/pl/amarok/faq.docbook
-share/doc/kde/HTML/pl/amarok/index.cache.bz2
-share/doc/kde/HTML/pl/amarok/index.docbook
-share/doc/kde/HTML/pl/amarok/quick.docbook
-share/doc/kde/HTML/pl/amarok/requirements.docbook
-share/doc/kde/HTML/pl/amarok/using.docbook
 share/doc/kde/HTML/pt/amarok/advanced.docbook
 share/doc/kde/HTML/pt/amarok/common
 share/doc/kde/HTML/pt/amarok/config.docbook
@@ -367,9 +353,8 @@ share/doc/kde/HTML/sv/amarok/using.docbook
 share/doc/kde/HTML/sv/amarok/vis_window.png
 share/doc/kde/HTML/sv/amarok/welcome.png
 share/kde/apps/amarok/amarokui.rc
-share/kde/apps/amarok/amarokui_xmms.rc
+share/kde/apps/amarok/data/Amarok_1.4_Welcome.ogg
 share/kde/apps/amarok/data/Cool-Streams.xml
-share/kde/apps/amarok/data/amaroK_1.4_welcome.ogg
 share/kde/apps/amarok/data/ball.png
 share/kde/apps/amarok/data/dot.png
 share/kde/apps/amarok/data/equalizer_presets.xml
@@ -382,26 +367,54 @@ share/kde/apps/amarok/icons/crystalsvg/16x16/actions/dynamic.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/equalizer.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/mini_dock.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/player_playlist_2.png
+share/kde/apps/amarok/icons/crystalsvg/16x16/actions/podcast.png
+share/kde/apps/amarok/icons/crystalsvg/16x16/actions/podcast_new.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/random.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_playlist.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/repeat_track.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/visualizations.png
 share/kde/apps/amarok/icons/crystalsvg/16x16/actions/wiki.png
+share/kde/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast.png
+share/kde/apps/amarok/icons/crystalsvg/22x22/actions/amarok_podcast_new.png
+share/kde/apps/amarok/icons/crystalsvg/22x22/actions/babelfish.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/dynamic.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/player_playlist_2.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/random.png
 share/kde/apps/amarok/icons/crystalsvg/22x22/actions/repeat_playlist.png
 share/kde/apps/amarok/icons/crystalsvg/64x64/actions/dynamic.png
+share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast.png
+share/kde/apps/amarok/icons/crystalsvg/64x64/actions/podcast_new.png
 share/kde/apps/amarok/icons/crystalsvg/64x64/actions/random.png
 share/kde/apps/amarok/icons/crystalsvg/64x64/actions/repeat_playlist.png
-share/kde/apps/amarok/icons/crystalsvg/scalable/actions/dynamic.svg
-share/kde/apps/amarok/icons/crystalsvg/scalable/actions/player_playlist_2.svg
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_add_lyrics.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_add_playlist.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_audioscrobbler.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_burn.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_change_language.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_circle.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_configure.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_covermanager.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_download.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_dynamic.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_edit.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_editcopy.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_equalizer.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_external.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_favourite_genres.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_files.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_files2.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_love.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_music.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_pause.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_play.png
@@ -410,20 +423,64 @@ share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_queue.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_album.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_no.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_random_track.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_redo.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_remove.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_remove_from_playlist.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_album.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_no.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_playlist.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_repeat_track.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rescan.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_save.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_scripts.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_search.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_engine.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_general.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_indicator.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_playback.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_settings_view.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_track.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_undo.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_visualizations.png
+share/kde/apps/amarok/icons/hicolor/16x16/actions/amarok_zoom.png
 share/kde/apps/amarok/icons/hicolor/16x16/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_add_lyrics.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_add_playlist.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_audioscrobbler.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_burn.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_change_language.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_circle.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_configure.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_covermanager.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_download.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_dynamic.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_edit.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_editcopy.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_equalizer.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_external.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_favourite_genres.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_files.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_files2.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_love.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_music.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_pause.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_play.png
@@ -432,20 +489,64 @@ share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_queue.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_album.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_no.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_random_track.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_redo.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_remove.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_remove_from_playlist.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_album.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_no.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_playlist.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_repeat_track.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rescan.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_save.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_scripts.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_search.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_engine.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_general.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_indicator.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_playback.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_settings_view.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_track.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_undo.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_visualizations.png
+share/kde/apps/amarok/icons/hicolor/22x22/actions/amarok_zoom.png
 share/kde/apps/amarok/icons/hicolor/22x22/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_add_lyrics.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_add_playlist.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_audioscrobbler.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_burn.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_change_language.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_circle.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_configure.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_covermanager.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_download.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_dynamic.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_edit.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_editcopy.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_equalizer.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_external.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_favourite_genres.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_files.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_files2.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_love.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_music.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_pause.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_play.png
@@ -454,21 +555,65 @@ share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_queue.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_album.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_no.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_random_track.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_redo.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_remove.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_remove_from_playlist.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_album.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_no.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_playlist.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_repeat_track.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rescan.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_save.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_scripts.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_search.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_engine.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_general.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_indicator.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_playback.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_settings_view.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_track.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_undo.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_visualizations.png
+share/kde/apps/amarok/icons/hicolor/32x32/actions/amarok_zoom.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/audioscrobbler.png
 share/kde/apps/amarok/icons/hicolor/32x32/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_add_lyrics.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_add_playlist.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_audioscrobbler.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_burn.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_change_language.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_circle.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_configure.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_covermanager.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_download.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_dynamic.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_edit.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_editcopy.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_equalizer.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_external.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_favourite_genres.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_files.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_files2.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_love.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_music.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_pause.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_play.png
@@ -477,20 +622,64 @@ share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_queue.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_album.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_no.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_random_track.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_redo.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_remove.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_remove_from_playlist.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_album.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_no.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_playlist.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_repeat_track.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rescan.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_save.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_scripts.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_search.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_engine.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_general.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_indicator.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_playback.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_settings_view.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_track.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_undo.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_visualizations.png
+share/kde/apps/amarok/icons/hicolor/48x48/actions/amarok_zoom.png
 share/kde/apps/amarok/icons/hicolor/48x48/actions/collection.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_add_lyrics.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_add_playlist.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_album.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_artist.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_audioscrobbler.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_back.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_burn.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_change_language.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_circle.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_clock.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_collection.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_configure.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_covermanager.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_device.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_download.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_dynamic.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_edit.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_editcopy.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_equalizer.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_external.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_fastforward.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_favourite_genres.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_files.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_files2.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_love.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_lyrics.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_mostplayed.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_music.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_pause.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_play.png
@@ -499,13 +688,34 @@ share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_clear.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_playlist_refresh.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_podcast2.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_queue.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_album.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_no.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_random_track.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_redo.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_refresh.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_remove.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_remove_from_playlist.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_album.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_no.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_playlist.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_repeat_track.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rescan.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_rewind.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_save.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_scripts.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_search.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_engine.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_general.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_indicator.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_playback.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_settings_view.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_stop.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_track.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_undo.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_visualizations.png
+share/kde/apps/amarok/icons/hicolor/64x64/actions/amarok_zoom.png
 share/kde/apps/amarok/icons/hicolor/64x64/actions/collection.png
 share/kde/apps/amarok/images/amarok_cut.png
 share/kde/apps/amarok/images/amarok_rocks.jpg
@@ -514,7 +724,6 @@ share/kde/apps/amarok/images/b_pause.png
 share/kde/apps/amarok/images/b_play.png
 share/kde/apps/amarok/images/b_prev.png
 share/kde/apps/amarok/images/b_stop.png
-share/kde/apps/amarok/images/babelfish.png
 share/kde/apps/amarok/images/back_stars_grey.png
 share/kde/apps/amarok/images/currenttrack_bar_left.png
 share/kde/apps/amarok/images/currenttrack_bar_mid.png
@@ -528,6 +737,7 @@ share/kde/apps/amarok/images/currenttrack_stop_small.png
 share/kde/apps/amarok/images/description.png
 share/kde/apps/amarok/images/eq_active2.png
 share/kde/apps/amarok/images/eq_inactive2.png
+share/kde/apps/amarok/images/lastfm.png
 share/kde/apps/amarok/images/loading1.png
 share/kde/apps/amarok/images/loading2.png
 share/kde/apps/amarok/images/logo_web.png
@@ -552,10 +762,6 @@ share/kde/apps/amarok/images/volumeslider-inset.png
 share/kde/apps/amarok/images/wizard_compact.png
 share/kde/apps/amarok/images/wizard_xmms.png
 share/kde/apps/amarok/images/xine_logo.png
-share/kde/apps/amarok/scripts/amarok_live/README
-share/kde/apps/amarok/scripts/amarok_live/amarok.live.remaster.part1.sh
-share/kde/apps/amarok/scripts/amarok_live/amarok.live.remaster.part2.sh
-share/kde/apps/amarok/scripts/amarok_live/amarok_live.py
 share/kde/apps/amarok/scripts/common/Publisher.py
 share/kde/apps/amarok/scripts/common/Zeroconf.py
 share/kde/apps/amarok/scripts/lyrics_astraweb/COPYING
@@ -571,6 +777,14 @@ share/kde/apps/amarok/scripts/playlist2html/PlaylistServer.py
 share/kde/apps/amarok/scripts/playlist2html/README
 share/kde/apps/amarok/scripts/playlist2html/playlist2html.py
 share/kde/apps/amarok/scripts/ruby_debug/debug.rb
+share/kde/apps/amarok/scripts/score_default/COPYING
+share/kde/apps/amarok/scripts/score_default/README
+share/kde/apps/amarok/scripts/score_default/score_default.rb
+share/kde/apps/amarok/scripts/score_default/score_default.spec
+share/kde/apps/amarok/scripts/score_impulsive/COPYING
+share/kde/apps/amarok/scripts/score_impulsive/README
+share/kde/apps/amarok/scripts/score_impulsive/score_impulsive.rb
+share/kde/apps/amarok/scripts/score_impulsive/score_impulsive.spec
 share/kde/apps/amarok/scripts/templates/amarok.rb
 share/kde/apps/amarok/scripts/templates/python_qt_template.py
 share/kde/apps/amarok/scripts/templates/ruby_qt_template.rb
@@ -615,6 +829,8 @@ share/kde/icons/hicolor/64x64/apps/amarok.png
 share/kde/services/amarok_generic-mediadevice.desktop
 share/kde/services/amarok_void-engine_plugin.desktop
 share/kde/services/amarok_xine-engine.desktop
+share/kde/services/lastfm.protocol
+share/kde/servicetypes/amarok_codecinstall.desktop
 share/kde/servicetypes/amarok_plugin.desktop
 share/locale/az/LC_MESSAGES/amarok.mo
 share/locale/bg/LC_MESSAGES/amarok.mo
@@ -638,9 +854,11 @@ share/locale/hu/LC_MESSAGES/amarok.mo
 share/locale/is/LC_MESSAGES/amarok.mo
 share/locale/it/LC_MESSAGES/amarok.mo
 share/locale/ja/LC_MESSAGES/amarok.mo
+share/locale/ka/LC_MESSAGES/amarok.mo
 share/locale/km/LC_MESSAGES/amarok.mo
 share/locale/ko/LC_MESSAGES/amarok.mo
 share/locale/lt/LC_MESSAGES/amarok.mo
+share/locale/ms/LC_MESSAGES/amarok.mo
 share/locale/nb/LC_MESSAGES/amarok.mo
 share/locale/nl/LC_MESSAGES/amarok.mo
 share/locale/nn/LC_MESSAGES/amarok.mo
@@ -661,7 +879,6 @@ share/locale/th/LC_MESSAGES/amarok.mo
 share/locale/tr/LC_MESSAGES/amarok.mo
 share/locale/uk/LC_MESSAGES/amarok.mo
 share/locale/uz/LC_MESSAGES/amarok.mo
-share/locale/xx/LC_MESSAGES/amarok.mo
 share/locale/zh_CN/LC_MESSAGES/amarok.mo
 share/locale/zh_TW/LC_MESSAGES/amarok.mo
 @comment in kde: @dirrm share/kde/servicetypes
@@ -686,12 +903,13 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 @dirrm share/kde/apps/amarok/themes
 @dirrm share/kde/apps/amarok/scripts/webcontrol
 @dirrm share/kde/apps/amarok/scripts/templates
+@dirrm share/kde/apps/amarok/scripts/score_impulsive
+@dirrm share/kde/apps/amarok/scripts/score_default
 @dirrm share/kde/apps/amarok/scripts/ruby_debug
 @dirrm share/kde/apps/amarok/scripts/playlist2html
 @dirrm share/kde/apps/amarok/scripts/lyrics_lyrc
 @dirrm share/kde/apps/amarok/scripts/lyrics_astraweb
 @dirrm share/kde/apps/amarok/scripts/common
-@dirrm share/kde/apps/amarok/scripts/amarok_live
 @dirrm share/kde/apps/amarok/scripts
 @dirrm share/kde/apps/amarok/images
 @dirrm share/kde/apps/amarok/icons/hicolor/64x64/actions
@@ -705,8 +923,6 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 @dirrm share/kde/apps/amarok/icons/hicolor/16x16/actions
 @dirrm share/kde/apps/amarok/icons/hicolor/16x16
 @dirrm share/kde/apps/amarok/icons/hicolor
-@dirrm share/kde/apps/amarok/icons/crystalsvg/scalable/actions
-@dirrm share/kde/apps/amarok/icons/crystalsvg/scalable
 @dirrm share/kde/apps/amarok/icons/crystalsvg/64x64/actions
 @dirrm share/kde/apps/amarok/icons/crystalsvg/64x64
 @dirrm share/kde/apps/amarok/icons/crystalsvg/22x22/actions
@@ -726,7 +942,6 @@ share/locale/zh_TW/LC_MESSAGES/amarok.mo
 @comment in kde: @dirrm share/doc/kde/HTML/pt_BR
 @dirrm share/doc/kde/HTML/pt/amarok
 @comment in kde: @dirrm share/doc/kde/HTML/pt
-@dirrm share/doc/kde/HTML/pl/amarok
 @dirrm share/doc/kde/HTML/nl/amarok
 @comment in kde: @dirrm share/doc/kde/HTML/nl
 @dirrm share/doc/kde/HTML/it/amarok
diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo
index 1ec50c4229e..9c602b7781c 100644
--- a/audio/amarok/distinfo
+++ b/audio/amarok/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.19 2006/05/31 17:59:57 wiz Exp $
+$NetBSD: distinfo,v 1.20 2006/07/04 06:45:16 wiz Exp $
 
-SHA1 (amarok-1.4.0a.tar.bz2) = 0274e7d7b780ab10c0d1357fe852d895d86dd409
-RMD160 (amarok-1.4.0a.tar.bz2) = 47ae8f9e23aec02f825fe3791eae63520f56394e
-Size (amarok-1.4.0a.tar.bz2) = 13045009 bytes
+SHA1 (amarok-1.4.1.tar.bz2) = ecabf7fd15ac45d29ccd1b9309f093ecda8acfab
+RMD160 (amarok-1.4.1.tar.bz2) = d9df29c2a2a7b81aabb73c66b83190f0bc109094
+Size (amarok-1.4.1.tar.bz2) = 13509939 bytes
 SHA1 (patch-aa) = 32ae1ed331a36951739651f380363b71cc0b04e8
 SHA1 (patch-ab) = 48c99f7eefef2925e76801dca0a97765ecba6609