Sync with FreeBSD ports.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13739 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 57 insertions, 280 deletions

diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 29f7190b7..910b9d7b2 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -3,12 +3,12 @@
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/rhythmbox/Makefile,v 1.103 2009/11/22 22:09:39 marcus Exp $
+#   $MCom: ports/audio/rhythmbox/Makefile,v 1.105 2010/02/27 23:08:17 marcus Exp $
 #
 
 PORTNAME=	rhythmbox
-PORTVERSION=	0.12.6
-PORTREVISION=	3
+PORTVERSION=	0.12.7
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,6 +16,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	Audio player for GNOME
 
+BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS=	musicbrainz.4:${PORTSDIR}/audio/libmusicbrainz \
     		musicbrainz3.6:${PORTSDIR}/audio/libmusicbrainz3 \
 		id3tag.0:${PORTSDIR}/audio/libid3tag \
@@ -53,6 +54,8 @@ OPTIONS=	DAAP "Enable iTunes music sharing" off \
 		MTP "Enable MS Media Transfer Protocol support" off \
 		ITMS_PLUGIN "Enable iTunes browser plugin" on
 
+MAN1=		rhythmbox-client.1 rhythmbox.1
+
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_VORBIS)
diff --git a/audio/rhythmbox/distinfo b/audio/rhythmbox/distinfo
index ae35bc94f..15b1590d0 100644
--- a/audio/rhythmbox/distinfo
+++ b/audio/rhythmbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/rhythmbox-0.12.6.tar.bz2) = c22ff476c956afeb7f694e5d1a59cfb9
-SHA256 (gnome2/rhythmbox-0.12.6.tar.bz2) = ddffa5b7e0e0fe81044354998fd91a58d4ff526746b17a6b638e0e8ea1ac9684
-SIZE (gnome2/rhythmbox-0.12.6.tar.bz2) = 5202025
+MD5 (gnome2/rhythmbox-0.12.7.tar.bz2) = db53503383a988b1d201d1b4da6a5087
+SHA256 (gnome2/rhythmbox-0.12.7.tar.bz2) = 4ab28b93b2e9d7bc9338194ba6e01549362fdd5b0cf2806da091fbfb2c2a8362
+SIZE (gnome2/rhythmbox-0.12.7.tar.bz2) = 5224160
diff --git a/audio/rhythmbox/files/patch-plugins_daap_rb-daap-src.c b/audio/rhythmbox/files/patch-plugins_daap_rb-daap-src.c
deleted file mode 100644
index 4d9bb5178..000000000
--- a/audio/rhythmbox/files/patch-plugins_daap_rb-daap-src.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- plugins/daap/rb-daap-src.c.orig	Fri Jan 27 21:11:13 2006
-+++ plugins/daap/rb-daap-src.c	Thu Feb  2 02:07:48 2006
-@@ -34,6 +34,7 @@
- #include <sys/ioctl.h>
- #include <netdb.h>
- #include <unistd.h>
-+#include <signal.h>
- #include <ctype.h>
- 
- #include <libsoup/soup-headers.h>
-@@ -435,7 +436,14 @@ rb_daap_src_write (RBDAAPSrc *src, const
- 	size_t bytes_written = 0;
- 
- 	while (bytes_written < count) {
--		ssize_t wrote = send (src->sock_fd, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
-+		ssize_t wrote;
-+#ifdef MSG_NOSIGNAL
-+		wrote = send (src->sock_fd, buf + bytes_written, count - bytes_written, MSG_NOSIGNAL);
-+#else
-+		signal (SIGPIPE, SIG_IGN);
-+		wrote = send (src->sock_fd, buf + bytes_written, count - bytes_written, 0);
-+		signal (SIGPIPE, SIG_DFL);
-+#endif
- 
- 		if (wrote < 0) {
- 			GST_WARNING ("error while writing: %s", g_strerror (errno));
diff --git a/audio/rhythmbox/files/patch-totem_pl_parser b/audio/rhythmbox/files/patch-totem_pl_parser
deleted file mode 100644
index a4a27903d..000000000
--- a/audio/rhythmbox/files/patch-totem_pl_parser
+++ /dev/null
@@ -1,240 +0,0 @@
-diff -urN plugins/generic-player/rb-generic-player-playlist-source.c plugins/generic-player/rb-generic-player-playlist-source.c
---- plugins/generic-player/rb-generic-player-playlist-source.c
-+++ plugins/generic-player/rb-generic-player-playlist-source.c
-@@ -49,6 +49,12 @@ typedef struct
- 	gboolean loading;
- } RBGenericPlayerPlaylistSourcePrivate;
- 
-+typedef struct
-+{
-+	RBGenericPlayerPlaylistSource *source;
-+	TotemPlPlaylist *playlist;
-+} SavePlaylistData;
-+
- RB_PLUGIN_DEFINE_TYPE(RBGenericPlayerPlaylistSource,
- 		      rb_generic_player_playlist_source,
- 		      RB_TYPE_STATIC_PLAYLIST_SOURCE)
-@@ -69,26 +75,37 @@ impl_save_to_xml (RBPlaylistSource *source, xmlNodePtr node)
- 	/* do nothing; just to prevent weirdness */
- }
- 
--static void
--save_playlist_entry (GtkTreeModel *model, GtkTreeIter *iter,
--		     char **uri, char **title,
--		     gboolean *custom_title,
--		     RBGenericPlayerPlaylistSource *source)
-+static gboolean
-+save_playlist_foreach (GtkTreeModel *model,
-+		       GtkTreePath *path,
-+		       GtkTreeIter *iter,
-+		       gpointer user_data)
- {
--	RBGenericPlayerPlaylistSourcePrivate *priv = GET_PRIVATE (source);
-+	SavePlaylistData *data = user_data;
-+	RBGenericPlayerPlaylistSourcePrivate *priv = GET_PRIVATE (data->source);
- 	RhythmDBEntry *entry;
--	const char *host_uri;
-+	TotemPlPlaylistIter pl_iter;
-+	const char *host_uri, *title;
-+	gchar *uri;
- 
- 	entry = rhythmdb_query_model_iter_to_entry (RHYTHMDB_QUERY_MODEL (model),
- 						    iter);
- 	if (entry == NULL) {
--		return;
-+		return FALSE;
- 	}
- 
- 	host_uri = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION);
--	*uri = rb_generic_player_source_uri_to_playlist_uri (priv->player_source, host_uri);
--	*title = rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_TITLE);
--	*custom_title = TRUE;
-+	uri = rb_generic_player_source_uri_to_playlist_uri (priv->player_source, host_uri);
-+	title = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_TITLE);
-+
-+	totem_pl_playlist_append (data->playlist, &pl_iter);
-+	totem_pl_playlist_set (data->playlist, &pl_iter,
-+			       TOTEM_PL_PARSER_FIELD_URI, uri,
-+			       TOTEM_PL_PARSER_FIELD_TITLE, title,
-+			       NULL);
-+	g_free (uri);
-+
-+	return FALSE;
- }
- 
- /* this probably belongs more in totem than here */
-@@ -119,11 +136,14 @@ save_playlist (RBGenericPlayerPlaylistSource *source)
- {
- 	TotemPlParser *parser;
- 	TotemPlParserType playlist_type;
-+	TotemPlPlaylist *playlist;
- 	RhythmDBQueryModel *query_model;
- 	char *name;
- 	char *temp_uri;
- 	GError *error = NULL;
- 	RBGenericPlayerPlaylistSourcePrivate *priv = GET_PRIVATE (source);
-+	SavePlaylistData data;
-+	GFile *file;
- 
- 	priv->save_playlist_id = 0;
- 	playlist_type = rb_generic_player_source_get_playlist_format (priv->player_source);
-@@ -173,41 +193,50 @@ save_playlist (RBGenericPlayerPlaylistSource *source)
- 	}
- 
- 	temp_uri = g_strdup_printf ("%s%06X", priv->playlist_path, g_random_int_range (0, 0xFFFFFF));
-+	file = g_file_new_for_path (temp_uri);
- 
- 	parser = totem_pl_parser_new ();
--	if (rb_debug_matches ("totem_pl_parser_write_with_title", "totem-pl-parser.c")) {
-+	playlist = totem_pl_playlist_new ();
-+
-+	data.source = source;
-+	data.playlist = playlist;
-+
-+	gtk_tree_model_foreach (GTK_TREE_MODEL (query_model),
-+				save_playlist_foreach,
-+				&data);
-+
-+	if (rb_debug_matches ("totem_pl_parser_save", "totem-pl-parser.c")) {
- 		g_object_set (parser, "debug", TRUE, NULL);
- 	}
--	if (totem_pl_parser_write_with_title (parser,
--					      GTK_TREE_MODEL (query_model),
--					      (TotemPlParserIterFunc) save_playlist_entry,
--					      temp_uri,
--					      name,
--					      playlist_type,
--					      source,
--					      &error) == FALSE) {
-+
-+	if (totem_pl_parser_save (parser,
-+				  playlist,
-+				  file,
-+				  name,
-+				  playlist_type,
-+				  &error) == FALSE) {
- 		/* XXX report this more usefully */
- 		g_warning ("Playlist save failed: %s", error->message);
- 	} else {
- 		GFile *dest;
--		GFile *src;
- 
- 		dest = g_file_new_for_path (priv->playlist_path);
--		src = g_file_new_for_path (temp_uri);
--		g_file_move (src, dest, G_FILE_COPY_OVERWRITE | G_FILE_COPY_NO_FALLBACK_FOR_MOVE, NULL, NULL, NULL, &error);
-+		g_file_move (file, dest, G_FILE_COPY_OVERWRITE | G_FILE_COPY_NO_FALLBACK_FOR_MOVE, NULL, NULL, NULL, &error);
- 		if (error != NULL) {
- 			/* XXX report this more usefully */
- 			g_warning ("Replacing playlist failed: %s", error->message);
- 		}
- 
- 		g_object_unref (dest);
--		g_object_unref (src);
- 	}
- 
- 	g_clear_error (&error);
- 	g_free (name);
- 	g_free (temp_uri);
- 	g_object_unref (query_model);
-+	g_object_unref (playlist);
-+	g_object_unref (parser);
-+	g_object_unref (file);
- 
- 	return FALSE;
- }
-diff -urN sources/rb-playlist-source.c sources/rb-playlist-source.c
---- sources/rb-playlist-source.c
-+++ sources/rb-playlist-source.c
-@@ -544,31 +544,31 @@ rb_playlist_source_drop_cb (GtkWidget *widget,
- 	gtk_drag_finish (context, TRUE, FALSE, time);
- }
- 
--static void
--playlist_iter_func (GtkTreeModel *model,
--		    GtkTreeIter *iter,
--		    char **uri,
--		    char **title,
--		    gboolean *custom_title,
--		    gpointer user_data)
-+static gboolean
-+playlist_iter_foreach (GtkTreeModel *model,
-+		       GtkTreePath *path,
-+		       GtkTreeIter *iter,
-+		       gpointer user_data)
- {
-+	TotemPlPlaylist *playlist = user_data;
-+	TotemPlPlaylistIter pl_iter;
- 	RhythmDBEntry *entry;
-+	const gchar *uri;
- 
- 	gtk_tree_model_get (model, iter, 0, &entry, -1);
- 
--	if (uri != NULL) {
--		*uri = rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_LOCATION);
--	}
--	if (title != NULL) {
--		*title = rhythmdb_entry_dup_string (entry, RHYTHMDB_PROP_TITLE);
--	}
--	if (custom_title != NULL) {
--		*custom_title = FALSE;
--	}
-+	uri = rhythmdb_entry_get_string (entry, RHYTHMDB_PROP_LOCATION);
-+
-+	totem_pl_playlist_append (playlist, &pl_iter);
-+	totem_pl_playlist_set (playlist, &pl_iter,
-+			       TOTEM_PL_PARSER_FIELD_URI, uri,
-+			       NULL);
- 
- 	if (entry != NULL) {
- 		rhythmdb_entry_unref (entry);
- 	}
-+
-+	return FALSE;
- }
- 
- /**
-@@ -585,15 +585,19 @@ rb_playlist_source_save_playlist (RBPlaylistSource *source,
- 				  const char *uri,
- 				  RBPlaylistExportType export_type)
- {
--	TotemPlParser *playlist;
-+	TotemPlParser *pl;
-+	TotemPlPlaylist *playlist;
- 	GError *error = NULL;
-+	GFile *file;
- 	char *name;
- 	gint totem_format;
- 
- 	g_return_if_fail (RB_IS_PLAYLIST_SOURCE (source));
- 
- 	rb_debug ("saving playlist");
--	playlist = totem_pl_parser_new ();
-+	pl = totem_pl_parser_new ();
-+	playlist = totem_pl_playlist_new ();
-+	file = g_file_new_for_uri (uri);
- 
- 	g_object_get (source, "name", &name, NULL);
- 
-@@ -610,12 +614,18 @@ rb_playlist_source_save_playlist (RBPlaylistSource *source,
- 		break;
- 	}
- 
--	totem_pl_parser_write_with_title (playlist, GTK_TREE_MODEL (source->priv->model),
--					  playlist_iter_func, uri, name,
--					  totem_format,
--					  NULL, &error);
-+	gtk_tree_model_foreach (GTK_TREE_MODEL (source->priv->model),
-+				playlist_iter_foreach,
-+				playlist);
-+
-+	totem_pl_parser_save (pl, playlist, file, name,
-+			      totem_format, &error);
-+
-+	g_object_unref (pl);
- 	g_object_unref (playlist);
-+	g_object_unref (file);
- 	g_free (name);
-+
- 	if (error != NULL) {
- 		rb_error_dialog (NULL, _("Couldn't save playlist"),
- 				 "%s", error->message);
diff --git a/audio/rhythmbox/pkg-plist b/audio/rhythmbox/pkg-plist
index aecba7e67..1f5657975 100644
--- a/audio/rhythmbox/pkg-plist
+++ b/audio/rhythmbox/pkg-plist
@@ -9,18 +9,12 @@ lib/librhythmbox-core.so.0
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/DiscogsCoverArtSearch.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/DiscogsCoverArtSearch.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/DiscogsCoverArtSearch.pyo
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/EmbeddedCoverArtSearch.pyo
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearchGIO.py
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearchGIO.pyc
-%%PYTHON%%lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearchGIO.pyo
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.py
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.pyc
 %%PYTHON%%lib/rhythmbox/plugins/artdisplay/MusicBrainzCoverArtSearch.pyo
@@ -79,6 +73,11 @@ lib/rhythmbox/plugins/cd-recorder/libcd-recorder.so
 %%DAAP%%lib/rhythmbox/plugins/daap/libdaap.la
 %%DAAP%%lib/rhythmbox/plugins/daap/libdaap.so
 %%DAAP%%lib/rhythmbox/plugins/daap/rb-daap-glue.h
+lib/rhythmbox/plugins/fmradio/fmradio-ui.xml
+lib/rhythmbox/plugins/fmradio/fmradio.rb-plugin
+lib/rhythmbox/plugins/fmradio/libfmradio.la
+lib/rhythmbox/plugins/fmradio/libfmradio.so
+lib/rhythmbox/plugins/generic-player/generic-player-info.ui
 lib/rhythmbox/plugins/generic-player/generic-player-ui.xml
 lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin
 lib/rhythmbox/plugins/generic-player/libgeneric-player.la
@@ -129,6 +128,9 @@ lib/rhythmbox/plugins/iradio/station-properties.ui
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyrcParser.py
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyrcParser.pyc
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyrcParser.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsSites.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsSites.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsSites.pyo
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricWikiParser.py
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricWikiParser.pyc
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricWikiParser.pyo
@@ -138,6 +140,9 @@ lib/rhythmbox/plugins/iradio/station-properties.ui
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsParse.py
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsParse.pyc
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/LyricsParse.pyo
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/TerraParser.py
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/TerraParser.pyc
+%%PYTHON%%lib/rhythmbox/plugins/lyrics/TerraParser.pyo
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/WinampcnParser.py
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/WinampcnParser.pyc
 %%PYTHON%%lib/rhythmbox/plugins/lyrics/WinampcnParser.pyo
@@ -160,7 +165,6 @@ lib/rhythmbox/plugins/iradio/station-properties.ui
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/__init__.pyo
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune-loading.ui
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune-prefs.ui
-%%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune-purchase.ui
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune_logo_color_small.png
 %%PYTHON%%lib/rhythmbox/plugins/magnatune/magnatune_logo_color_tiny.png
@@ -193,6 +197,21 @@ lib/rhythmbox/plugins/power-manager/power-manager.rb-plugin
 %%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.py
 %%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.pyc
 %%PYTHON%%lib/rhythmbox/plugins/rb/stringmatch.pyo
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/__init__.pyo
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/config.py
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/config.pyc
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/config.pyo
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/player.py
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/player.pyc
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/player.pyo
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain-prefs.ui
+%%PYTHON%%lib/rhythmbox/plugins/replaygain/replaygain.rb-plugin
+%%PYTHON%%lib/rhythmbox/plugins/sendto/__init__.py
+%%PYTHON%%lib/rhythmbox/plugins/sendto/__init__.pyc
+%%PYTHON%%lib/rhythmbox/plugins/sendto/__init__.pyo
+%%PYTHON%%lib/rhythmbox/plugins/sendto/sendto.rb-plugin
 lib/rhythmbox/plugins/status-icon/libstatus-icon.la
 lib/rhythmbox/plugins/status-icon/libstatus-icon.so
 lib/rhythmbox/plugins/status-icon/status-icon-preferences.ui
@@ -451,6 +470,20 @@ share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png
 share/gnome/help/rhythmbox/sv/figures/rb-window-small.png
 share/gnome/help/rhythmbox/sv/figures/rb-window.png
 share/gnome/help/rhythmbox/sv/rhythmbox.xml
+share/gnome/help/rhythmbox/uk/figures/rb-iradio-main.png
+share/gnome/help/rhythmbox/uk/figures/rb-notification-area-menu.png
+share/gnome/help/rhythmbox/uk/figures/rb-notification-window.png
+share/gnome/help/rhythmbox/uk/figures/rb-notification-zone.png
+share/gnome/help/rhythmbox/uk/figures/rb-podcast-main.png
+share/gnome/help/rhythmbox/uk/figures/rb-statusbar.png
+share/gnome/help/rhythmbox/uk/figures/rb-toolbar-prevplaynext.png
+share/gnome/help/rhythmbox/uk/figures/rb-toolbar-repeat.png
+share/gnome/help/rhythmbox/uk/figures/rb-toolbar-shuffle.png
+share/gnome/help/rhythmbox/uk/figures/rb-toolbar.png
+share/gnome/help/rhythmbox/uk/figures/rb-volume-changer.png
+share/gnome/help/rhythmbox/uk/figures/rb-window-small.png
+share/gnome/help/rhythmbox/uk/figures/rb-window.png
+share/gnome/help/rhythmbox/uk/rhythmbox.xml
 share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png
 share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png
@@ -554,6 +587,7 @@ share/omf/rhythmbox/rhythmbox-it.omf
 share/omf/rhythmbox/rhythmbox-oc.omf
 share/omf/rhythmbox/rhythmbox-ru.omf
 share/omf/rhythmbox/rhythmbox-sv.omf
+share/omf/rhythmbox/rhythmbox-uk.omf
 share/omf/rhythmbox/rhythmbox-zh_CN.omf
 share/rhythmbox/create-playlist.ui
 share/rhythmbox/general-prefs.ui
@@ -611,6 +645,7 @@ share/rhythmbox/icons/hicolor/scalable/places/playlist-automatic.svg
 share/rhythmbox/icons/hicolor/scalable/places/playlist.svg
 share/rhythmbox/icons/hicolor/scalable/status/rhythmbox-notplaying.svg
 share/rhythmbox/library-prefs.ui
+share/rhythmbox/media-player-properties.ui
 share/rhythmbox/playback-prefs.ui
 share/rhythmbox/playlist-save.ui
 share/rhythmbox/playlists.xml
@@ -641,11 +676,13 @@ share/rhythmbox/uri-new.ui
 @dirrm share/rhythmbox/icons/hicolor/16x16/actions
 @dirrm share/rhythmbox/icons/hicolor/16x16
 @dirrm share/rhythmbox/icons/hicolor
-@dirrm share/rhythmbox/icons/
+@dirrm share/rhythmbox/icons
 @dirrm share/rhythmbox
 @dirrm share/omf/rhythmbox
 @dirrm share/gnome/help/rhythmbox/zh_CN/figures
 @dirrm share/gnome/help/rhythmbox/zh_CN
+@dirrm share/gnome/help/rhythmbox/uk/figures
+@dirrm share/gnome/help/rhythmbox/uk
 @dirrm share/gnome/help/rhythmbox/sv/figures
 @dirrm share/gnome/help/rhythmbox/sv
 @dirrm share/gnome/help/rhythmbox/ru/figures
@@ -673,6 +710,8 @@ share/rhythmbox/uri-new.ui
 @dirrm lib/rhythmbox/plugins/visualizer
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/upnp_coherence
 @dirrm lib/rhythmbox/plugins/status-icon
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/sendto
+%%PYTHON%%@dirrm lib/rhythmbox/plugins/replaygain
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/rb
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/python-console
 @dirrm lib/rhythmbox/plugins/power-manager
@@ -686,6 +725,7 @@ share/rhythmbox/uri-new.ui
 %%IPOD%%@dirrm lib/rhythmbox/plugins/ipod
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/im-status
 @dirrm lib/rhythmbox/plugins/generic-player
+@dirrm lib/rhythmbox/plugins/fmradio
 %%DAAP%%@dirrm lib/rhythmbox/plugins/daap
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/context/tmpl
 %%PYTHON%%@dirrm lib/rhythmbox/plugins/context/img