4 files changed, 174 insertions, 60 deletions

diff --git a/multimedia/totem/Makefile b/multimedia/totem/Makefile
index a3d9787d1950..a841a1764244 100644
--- a/multimedia/totem/Makefile
+++ b/multimedia/totem/Makefile
@@ -3,17 +3,18 @@
 # Whom:                 Hendrik Scholz <hendrik@scholz.net>
 #
 # $FreeBSD$
+#    $MCom: ports/multimedia/totem/Makefile,v 1.77 2007/03/11 05:25:07 mezz Exp $
 #
 
 PORTNAME=	totem
-PORTVERSION=	2.16.5
-PORTREVISION?=	1
+PORTVERSION=	2.18.0
+PORTREVISION?=	0
 CATEGORIES=	multimedia gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	A Xine-based video player for the GNOME 2 Desktop
+COMMENT?=	A gstreamer-based video player for the GNOME 2 Desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
 LIB_DEPENDS=	musicbrainz:${PORTSDIR}/audio/libmusicbrainz \
@@ -36,27 +37,23 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 	       	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lXrandr"
 
-OPTIONS?=	DVDNAV "Enable DVD support" on \
-		GSTREAMER "Use Gstreamer instead of Xine" off \
-		MOZILLA_PLUGIN "Totem mozilla plugin" off
-
-MAN1=	totem.1 totem-video-thumbnailer.1
+MAN1=		totem.1 totem-video-thumbnailer.1
 GCONF_SCHEMAS=	totem-handlers.schemas totem-video-thumbnail.schemas \
 		totem.schemas
-CONFLICTS?=	totem-gstreamer-[0-9]*
+CONFLICTS?=	totem-gstreamer-[0-9]* totem-xine-[0-9]*
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_MOZILLA_PLUGIN)
-USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox15<->firefox
+.if defined(WITH_MOZILLA_PLUGIN) && ${SLAVE_PORT:L}=="yes"
+USE_GECKO=	firefox mozilla seamonkey xulrunner<->firefox firefox-devel<->firefox
 .include "${PORTSDIR}/www/mozilla/bsd.gecko.mk"
-PLIST_SUB+=	MOZILLA=""
 CONFIGURE_ARGS+=--with-mozilla=${GECKO} \
 		--enable-gmp-plugin \
 		--enable-complex-plugin \
 		--enable-narrowspace-plugin
+BUILD_WRKSRC=	${WRKSRC}/browser-plugin
+INSTALL_WRKSRC=	${WRKSRC}/browser-plugin
 .else
-PLIST_SUB+=	MOZILLA="@comment "
 CONFIGURE_ARGS+=--without-mozilla \
 		--disable-browser-plugins \
 		--disable-mozilla \
@@ -66,13 +63,13 @@ CONFIGURE_ARGS+=--without-mozilla \
 		--disable-narrowspace-plugin
 .endif
 
-.if defined(WITH_GSTREAMER)
+.if !defined(WITH_TOTEM_XINE) || ${SLAVE_PORT}=="no"
 CONFIGURE_ARGS+=--enable-gstreamer=yes
 USE_GSTREAMER+=	gnomevfs core gconf hal good mpeg2dec ugly
 WITHOUT_DVDNAV=	yes
 PLIST_SUB+=	GSTREAMER=""
 .else
-LIB_DEPENDS+=	xine.1:${PORTSDIR}/multimedia/libxine
+LIB_DEPENDS+=	xine.16:${PORTSDIR}/multimedia/libxine
 PLIST_SUB+=	GSTREAMER="@comment "
 .endif
 
@@ -101,6 +98,8 @@ post-patch:
 		s|mozilla/plugins|browser_plugins|' \
 		${WRKSRC}/browser-plugin/Makefile.in \
 		${WRKSRC}/browser-plugin/idl/Makefile.in
+	@${REINPLACE_CMD} -e 's|dbus >= 0.61|dbus-1 >= 0.61|g' \
+	    	${WRKSRC}/configure
 .if defined(WITH_GSTREAMER)
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|' \
 		${WRKSRC}/src/backend/bacon-video-widget-gst-0.10.c
diff --git a/multimedia/totem/distinfo b/multimedia/totem/distinfo
index 6ef9be0f1ce6..e04ea7f028fb 100644
--- a/multimedia/totem/distinfo
+++ b/multimedia/totem/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/totem-2.16.5.tar.bz2) = fa8eb90b52d70d876e1d42ec43cf8448
-SHA256 (gnome2/totem-2.16.5.tar.bz2) = 7dab6a72cbf9d242a8eb13e4fce70aa3e730f7f74dad84181034022edfbb37df
-SIZE (gnome2/totem-2.16.5.tar.bz2) = 1820880
+MD5 (gnome2/totem-2.18.0.tar.bz2) = 1a3bfeaac6297b259967f5d79896b0e7
+SHA256 (gnome2/totem-2.18.0.tar.bz2) = 5f5228c64865b3caf928caada2eca8868abc04d939ac0f03a1069f7815584fca
+SIZE (gnome2/totem-2.18.0.tar.bz2) = 2050182
diff --git a/multimedia/totem/files/patch-browser-plugin_Makefile.in b/multimedia/totem/files/patch-browser-plugin_Makefile.in
new file mode 100644
index 000000000000..2dd84be05bc8
--- /dev/null
+++ b/multimedia/totem/files/patch-browser-plugin_Makefile.in
@@ -0,0 +1,110 @@
+--- browser-plugin/Makefile.in.orig	Fri Mar  2 07:22:29 2007
++++ browser-plugin/Makefile.in	Fri Mar  2 07:24:05 2007
+@@ -72,7 +72,7 @@
+ pluginLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(noinst_LTLIBRARIES) $(plugin_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_DEPENDENCIES = \
+ @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+@@ -88,7 +88,7 @@
+ 	$(am_libtotem_basic_plugin_la_OBJECTS)
+ @ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_rpath = -rpath \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(plugindir)
+-@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_DEPENDENCIES = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+@@ -104,7 +104,7 @@
+ 	$(am_libtotem_complex_plugin_la_OBJECTS)
+ @ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_rpath =  \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	-rpath $(plugindir)
+-@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_DEPENDENCIES = \
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+@@ -124,7 +124,7 @@
+ libtotem_gmp_plugin_la_OBJECTS = $(am_libtotem_gmp_plugin_la_OBJECTS)
+ @ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_rpath = -rpath \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(plugindir)
+-@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_DEPENDENCIES = \
+ @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+@@ -140,7 +140,7 @@
+ 	$(am_libtotem_mully_plugin_la_OBJECTS)
+ @ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_rpath = -rpath \
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(plugindir)
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = $(top_builddir)/src/plparse/libtotem-plparser-mini.la \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_DEPENDENCIES = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_marshal.la \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+@@ -360,7 +360,7 @@
+ MOZILLA_LIBDIR = @MOZILLA_LIBDIR@
+ MOZILLA_NOT_LINKED_CFLAGS = @MOZILLA_NOT_LINKED_CFLAGS@
+ MOZILLA_NOT_LINKED_LIBS = @MOZILLA_NOT_LINKED_LIBS@
+-MOZILLA_PLUGINDIR = @MOZILLA_PLUGINDIR@
++MOZILLA_PLUGINDIR = /var/tmp/totem/lib/browser_plugins
+ MOZILLA_PREFIX = @MOZILLA_PREFIX@
+ MOZILLA_XPCOM_CFLAGS = @MOZILLA_XPCOM_CFLAGS@
+ MOZILLA_XPIDL = @MOZILLA_XPIDL@
+@@ -464,7 +464,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ SUBDIRS = idl
+-plugindir = $(libdir)/mozilla/plugins
++plugindir = $(libdir)/browser_plugins
+ plugin_LTLIBRARIES = $(am__append_1) $(am__append_2) $(am__append_3) \
+ 	$(am__append_4) $(am__append_5)
+ BUILT_SOURCES = $(libtotempluginviewer_marshal_la_SOURCES) \
+@@ -581,7 +581,7 @@
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(AM_CXXFLAGS)
+ 
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_LIBADD = \
+-@ENABLE_BASIC_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
++@ENABLE_BASIC_PLUGIN_TRUE@	-ltotem-plparser \
+ @ENABLE_BASIC_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+ @ENABLE_BASIC_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
+@@ -641,7 +641,7 @@
+ @ENABLE_GMP_PLUGIN_TRUE@	$(AM_CXXFLAGS)
+ 
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_LIBADD = \
+-@ENABLE_GMP_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
++@ENABLE_GMP_PLUGIN_TRUE@	-ltotem-plparser \
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotempluginviewer_marshal.la	\
+ @ENABLE_GMP_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+ @ENABLE_GMP_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
+@@ -695,7 +695,7 @@
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(AM_CXXFLAGS)
+ 
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_LIBADD = \
+-@ENABLE_COMPLEX_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	-ltotem-plparser \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
+@@ -749,7 +749,7 @@
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(AM_CXXFLAGS)
+ 
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_LIBADD = \
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	-ltotem-plparser \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
+@@ -803,7 +803,7 @@
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(AM_CXXFLAGS)
+ 
+ @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_LIBADD = \
+-@ENABLE_MULLY_PLUGIN_TRUE@	$(top_builddir)/src/plparse/libtotem-plparser-mini.la		\
++@ENABLE_MULLY_PLUGIN_TRUE@	-ltotem-plparser \
+ @ENABLE_MULLY_PLUGIN_TRUE@	libtotempluginviewer_marshal.la					\
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(DBUS_LIBS)	\
+ @ENABLE_MULLY_PLUGIN_TRUE@ 	$(MOZILLA_LIBS)	\
diff --git a/multimedia/totem/pkg-plist b/multimedia/totem/pkg-plist
index 6dd28c03b85f..a0e9701a7219 100644
--- a/multimedia/totem/pkg-plist
+++ b/multimedia/totem/pkg-plist
@@ -1,29 +1,10 @@
 bin/totem
+bin/totem-video-indexer
 bin/totem-video-thumbnailer
 include/totem/1/plparser/totem-disc.h
 include/totem/1/plparser/totem-pl-parser-builtins.h
 include/totem/1/plparser/totem-pl-parser-features.h
 include/totem/1/plparser/totem-pl-parser.h
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-basic-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-complex-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-gmp-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-mully-plugin.xpt
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.a
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.la
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.so
-%%MOZILLA%%lib/browser_plugins/libtotem-narrowspace-plugin.xpt
 lib/libtotem-plparser.a
 lib/libtotem-plparser.la
 lib/libtotem-plparser.so
@@ -32,7 +13,6 @@ lib/nautilus/extensions-1.0/libtotem-properties-page.a
 lib/nautilus/extensions-1.0/libtotem-properties-page.la
 lib/nautilus/extensions-1.0/libtotem-properties-page.so
 libdata/pkgconfig/totem-plparser.pc
-%%MOZILLA%%libexec/totem-mozilla-viewer
 share/gnome/applications/totem.desktop
 share/gnome/help/totem/C/figures/totem_next_button.png
 share/gnome/help/totem/C/figures/totem_pause_button.png
@@ -55,7 +35,6 @@ share/gnome/help/totem/de/figures/totem_show_playlist_button.png
 share/gnome/help/totem/de/figures/totem_start_window.png
 share/gnome/help/totem/de/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/de/figures/totem_volume_mute_button.png
-share/gnome/help/totem/de/legal.xml
 share/gnome/help/totem/de/totem.xml
 share/gnome/help/totem/es/figures/totem_next_button.png
 share/gnome/help/totem/es/figures/totem_pause_button.png
@@ -65,7 +44,6 @@ share/gnome/help/totem/es/figures/totem_show_playlist_button.png
 share/gnome/help/totem/es/figures/totem_start_window.png
 share/gnome/help/totem/es/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/es/figures/totem_volume_mute_button.png
-share/gnome/help/totem/es/legal.xml
 share/gnome/help/totem/es/totem.xml
 share/gnome/help/totem/fr/figures/totem_next_button.png
 share/gnome/help/totem/fr/figures/totem_pause_button.png
@@ -75,12 +53,43 @@ share/gnome/help/totem/fr/figures/totem_show_playlist_button.png
 share/gnome/help/totem/fr/figures/totem_start_window.png
 share/gnome/help/totem/fr/figures/totem_volume_maximum_button.png
 share/gnome/help/totem/fr/figures/totem_volume_mute_button.png
-share/gnome/help/totem/fr/legal.xml
 share/gnome/help/totem/fr/totem.xml
-share/gnome/help/totem/ru/figures/totem_screenshot.png
+share/gnome/help/totem/pa/figures/totem_next_button.png
+share/gnome/help/totem/pa/figures/totem_pause_button.png
+share/gnome/help/totem/pa/figures/totem_play_button.png
+share/gnome/help/totem/pa/figures/totem_previous_button.png
+share/gnome/help/totem/pa/figures/totem_show_playlist_button.png
+share/gnome/help/totem/pa/figures/totem_start_window.png
+share/gnome/help/totem/pa/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/pa/figures/totem_volume_mute_button.png
+share/gnome/help/totem/pa/totem.xml
+share/gnome/help/totem/pt_BR/figures/totem_next_button.png
+share/gnome/help/totem/pt_BR/figures/totem_pause_button.png
+share/gnome/help/totem/pt_BR/figures/totem_play_button.png
+share/gnome/help/totem/pt_BR/figures/totem_previous_button.png
+share/gnome/help/totem/pt_BR/figures/totem_show_playlist_button.png
+share/gnome/help/totem/pt_BR/figures/totem_start_window.png
+share/gnome/help/totem/pt_BR/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/pt_BR/figures/totem_volume_mute_button.png
+share/gnome/help/totem/pt_BR/totem.xml
+share/gnome/help/totem/ru/figures/totem_next_button.png
+share/gnome/help/totem/ru/figures/totem_pause_button.png
+share/gnome/help/totem/ru/figures/totem_play_button.png
+share/gnome/help/totem/ru/figures/totem_previous_button.png
+share/gnome/help/totem/ru/figures/totem_show_playlist_button.png
 share/gnome/help/totem/ru/figures/totem_start_window.png
-share/gnome/help/totem/ru/legal.xml
+share/gnome/help/totem/ru/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/ru/figures/totem_volume_mute_button.png
 share/gnome/help/totem/ru/totem.xml
+share/gnome/help/totem/sv/figures/totem_next_button.png
+share/gnome/help/totem/sv/figures/totem_pause_button.png
+share/gnome/help/totem/sv/figures/totem_play_button.png
+share/gnome/help/totem/sv/figures/totem_previous_button.png
+share/gnome/help/totem/sv/figures/totem_show_playlist_button.png
+share/gnome/help/totem/sv/figures/totem_start_window.png
+share/gnome/help/totem/sv/figures/totem_volume_maximum_button.png
+share/gnome/help/totem/sv/figures/totem_volume_mute_button.png
+share/gnome/help/totem/sv/totem.xml
 share/gnome/help/totem/uk/figures/totem_next_button.png
 share/gnome/help/totem/uk/figures/totem_pause_button.png
 share/gnome/help/totem/uk/figures/totem_play_button.png
@@ -96,32 +105,23 @@ share/gnome/omf/totem/totem-bg.omf
 share/gnome/omf/totem/totem-de.omf
 share/gnome/omf/totem/totem-es.omf
 share/gnome/omf/totem/totem-fr.omf
+share/gnome/omf/totem/totem-pa.omf
+share/gnome/omf/totem/totem-pt_BR.omf
 share/gnome/omf/totem/totem-ru.omf
+share/gnome/omf/totem/totem-sv.omf
 share/gnome/omf/totem/totem-uk.omf
 share/gnome/pixmaps/vanity.png
-%%MOZILLA%%share/gnome/totem/doc/totemIBasicPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemIComplexPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemIGMPControls.html
-%%MOZILLA%%share/gnome/totem/doc/totemIGMPPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemIMullYPlayer.html
-%%MOZILLA%%share/gnome/totem/doc/totemINarrowSpacePlayer.html
 share/gnome/totem/filmholes-big-left.png
 share/gnome/totem/filmholes-big-right.png
 share/gnome/totem/filmholes.png
 share/gnome/totem/mozilla-viewer.glade
-share/gnome/totem/playlist-playing.png
+share/gnome/totem/playlist-ui.xml
 share/gnome/totem/playlist.glade
-share/gnome/totem/popup.glade
 share/gnome/totem/properties.glade
-share/gnome/totem/rhythmbox-volume-max.png
-share/gnome/totem/rhythmbox-volume-zero.png
 share/gnome/totem/screenshot.glade
 share/gnome/totem/skip_to.glade
 share/gnome/totem/stock-tool-brightness-contrast-22.png
-share/gnome/totem/stock_media_next.png
-share/gnome/totem/stock_media_pause.png
-share/gnome/totem/stock_media_play.png
-share/gnome/totem/stock_media_previous.png
+share/gnome/totem/totem-ui.xml
 share/gnome/totem/totem.glade
 share/gnome/totem/totem_logo.png
 share/gnome/totem/uri.glade
@@ -166,11 +166,11 @@ share/locale/id/LC_MESSAGES/totem.mo
 share/locale/is/LC_MESSAGES/totem.mo
 share/locale/it/LC_MESSAGES/totem.mo
 share/locale/ja/LC_MESSAGES/totem.mo
-share/locale/ka/LC_MESSAGES/totem.mo
 share/locale/ko/LC_MESSAGES/totem.mo
 share/locale/ku/LC_MESSAGES/totem.mo
 share/locale/lt/LC_MESSAGES/totem.mo
 share/locale/lv/LC_MESSAGES/totem.mo
+share/locale/ka/LC_MESSAGES/totem.mo
 share/locale/mg/LC_MESSAGES/totem.mo
 share/locale/mk/LC_MESSAGES/totem.mo
 share/locale/ml/LC_MESSAGES/totem.mo
@@ -206,13 +206,18 @@ share/locale/xh/LC_MESSAGES/totem.mo
 share/locale/zh_CN/LC_MESSAGES/totem.mo
 share/locale/zh_HK/LC_MESSAGES/totem.mo
 share/locale/zh_TW/LC_MESSAGES/totem.mo
-@dirrm share/gnome/totem/doc
 @dirrm share/gnome/totem
 @dirrm share/gnome/omf/totem
 @dirrm share/gnome/help/totem/uk/figures
 @dirrm share/gnome/help/totem/uk
+@dirrm share/gnome/help/totem/sv/figures
+@dirrm share/gnome/help/totem/sv
 @dirrm share/gnome/help/totem/ru/figures
 @dirrm share/gnome/help/totem/ru
+@dirrm share/gnome/help/totem/pt_BR/figures
+@dirrm share/gnome/help/totem/pt_BR
+@dirrm share/gnome/help/totem/pa/figures
+@dirrm share/gnome/help/totem/pa
 @dirrm share/gnome/help/totem/fr/figures
 @dirrm share/gnome/help/totem/fr
 @dirrm share/gnome/help/totem/es/figures