diff -Nru totem-2.30.0git20100413/aclocal.m4 totem-2.30.1/aclocal.m4 diff -Nru totem-2.30.0git20100413/bindings/Makefile.in totem-2.30.1/bindings/Makefile.in diff -Nru totem-2.30.0git20100413/bindings/python/Makefile.in totem-2.30.1/bindings/python/Makefile.in diff -Nru totem-2.30.0git20100413/bindings/vala/Makefile.in totem-2.30.1/bindings/vala/Makefile.in diff -Nru totem-2.30.0git20100413/browser-plugin/Makefile.in totem-2.30.1/browser-plugin/Makefile.in diff -Nru totem-2.30.0git20100413/browser-plugin/totem-plugin-viewer.c totem-2.30.1/browser-plugin/totem-plugin-viewer.c --- totem-2.30.0git20100413/browser-plugin/totem-plugin-viewer.c 2010-04-14 12:09:25.000000000 +0200 +++ totem-2.30.1/browser-plugin/totem-plugin-viewer.c 2010-04-27 11:17:30.000000000 +0200 @@ -102,6 +102,7 @@ typedef struct _TotemEmbedded { GObject parent; + DBusGConnection *conn; GtkWidget *window; GtkBuilder *menuxml, *xml; GtkWidget *about; @@ -288,6 +289,12 @@ static void totem_embedded_error_and_exit (char *title, char *reason, TotemEmbedded *emb) { + /* Avoid any more contacts, so drop off the bus */ + if (emb->conn != NULL) { + dbus_g_connection_unregister_g_object(emb->conn, G_OBJECT (emb)); + emb->conn = NULL; + } + /* FIXME send a signal to the plugin with the error message instead! */ totem_interface_error_blocking (title, reason, GTK_WINDOW (emb->window)); @@ -2390,8 +2397,10 @@ emb->referrer_uri = arg_referrer; /* FIXME: register this BEFORE requesting the service name? */ - dbus_g_connection_register_g_object - (conn, TOTEM_PLUGIN_VIEWER_DBUS_PATH, G_OBJECT (emb)); + dbus_g_connection_register_g_object (conn, + TOTEM_PLUGIN_VIEWER_DBUS_PATH, + G_OBJECT (emb)); + emb->conn = conn; /* If we're hidden, construct a hidden window; * else wait to be plugged in. diff -Nru totem-2.30.0git20100413/ChangeLog totem-2.30.1/ChangeLog --- totem-2.30.0git20100413/ChangeLog 2010-04-14 12:16:28.000000000 +0200 +++ totem-2.30.1/ChangeLog 2010-04-27 11:37:35.000000000 +0200 @@ -1,3 +1,141 @@ +commit 3f8ae7afeb7bbdfb03f039e99eb5b259e892936d +Author: Bastien Nocera +Date: Tue Apr 27 10:24:12 2010 +0100 + + 2.30.1 + + NEWS | 20 ++++++++++++++++++++ + configure.in | 2 +- + 2 files changed, 21 insertions(+), 1 deletions(-) + +commit e17595407217defbd08c363bb5202889558ccba3 +Author: Carles Ferrando +Date: Wed Apr 21 22:40:22 2010 +0200 + + Updated Catalan (Valencian) translation + + po/ca@valencia.po | 1686 ++++++++++++++++++++++++++++++++++++++--------------- + 1 files changed, 1202 insertions(+), 484 deletions(-) + +commit e0e9167b408f2a3d2e89a2454cd6caf2f01c9010 +Author: Shankar Prasad +Date: Wed Apr 21 18:11:51 2010 +0530 + + Updated Kannada translations + + po/kn.po | 777 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 385 insertions(+), 392 deletions(-) + +commit f8861bf66c1af308c31ea6d471b1f0f47ec62793 +Author: Bastien Nocera +Date: Tue Apr 20 13:35:36 2010 +0100 + + Fix artifacts or black screen when paused + + Fix regression introduced by commit eb74e996. + + The video widget expects to not be double-buffered by default, + and was due to an error when converting from pre-G_SEAL gtk_widget + calls. + + https://bugzilla.gnome.org/show_bug.cgi?id=614177 + + src/backend/bacon-video-widget-gst-0.10.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 540aaa7a104de22128218dd96be2c1078d2a3f8c +Author: Philip Withnall +Date: Fri Apr 16 19:54:06 2010 +0100 + + Bug 615506 — totem: Youtube Search lasts forever while playing Video + + Use a network timeout of 30 seconds if it's supported by the version of + libgdata we're building against. This will error out of queries if they take + longer than 30 seconds. Closes: bgo#615506 + + configure.in | 7 +++++++ + src/plugins/youtube/totem-youtube.c | 6 ++++++ + 2 files changed, 13 insertions(+), 0 deletions(-) + +commit 376f92f60f2fa7e695bdd472d0a9b9f298a300d8 +Author: Runa Bhattacharjee +Date: Sat Apr 17 15:03:49 2010 +0530 + + Updated Bengali India Translation + + po/bn_IN.po | 695 +++++++++++++++++++++++++++-------------------------------- + 1 files changed, 320 insertions(+), 375 deletions(-) + +commit 013d7840fae287aa431699dbcaeb79c644cd6bc0 +Author: Shaun McCance +Date: Fri Apr 16 09:05:19 2010 -0500 + + Fixed invalid multiple objects on RDF properties + + totem.doap | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit bff0927709eeca0046307185930fb09a60b4f407 +Author: Bastien Nocera +Date: Fri Apr 16 10:03:14 2010 +0100 + + Require gstreamer 0.10.28.1 for queue2 fixes + + So we can depend on the buffering-left time in queue2 being + implemented for the bvw_buffering_done() function. + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 052768b8e5f9073f9991b73e8dac154c0da9d726 +Author: Bastien Nocera +Date: Fri Apr 16 10:02:49 2010 +0100 + + Add debug for download buffering "buffering done" + + So we know what's going on. + + src/backend/bacon-video-widget-gst-0.10.c | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) + +commit bd2e1e47f39f13c579114c43c452c03c0977f1e0 +Author: Ask H. Larsen +Date: Wed Apr 14 18:26:07 2010 +0200 + + Updated Danish translation + + po/da.po | 295 ++++++++++++++++++++++++++++++-------------------------------- + 1 files changed, 143 insertions(+), 152 deletions(-) + +commit f4de4ee5c6992a2430c1888e0964f27809621462 +Author: Hagen Fürstenau +Date: Wed Apr 14 13:37:12 2010 +0100 + + Fix possible crasher when PyGTK isn't available + + If PyGTK is available at compile-time, but not available at run-time, + then we shouldn't try to call pyg_gil_state_ensure() as it would crash. + + Print errors and disable Python support if PyGTK isn't available. + + https://bugzilla.gnome.org/show_bug.cgi?id=615437 + + src/plugins/totem-python-module.c | 16 +++++++++++++--- + 1 files changed, 13 insertions(+), 3 deletions(-) + +commit 24c12eb129fc66f3578f4b1317bc528640e522a1 +Author: Bastien Nocera +Date: Wed Apr 14 13:27:14 2010 +0100 + + Avoid crashes on exit + + When the plugin viewer is set to exit, we don't want to receive + messages on the bus, or we might crash. Just close the D-Bus + connection before showing the error message. + + browser-plugin/totem-plugin-viewer.c | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + commit 7687ebf72c3b17c971d6eea5ec898f6bc096d596 Author: Sandeep Shedmake Date: Tue Apr 13 20:03:47 2010 +0530 @@ -5390,66 +5528,3 @@ ChangeLog.pre-gitlog |27047 ++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 11 + 3 files changed, 27058 insertions(+), 27047 deletions(-) - -commit 3660f991631e8fefce44da2946fdf11378817120 -Author: Philip Withnall -Date: Mon Jul 20 22:47:57 2009 +0100 - - Fixed libgdata 0.4.0 compatibility problems - - 2009-07-20 Philip Withnall - - * src/plugins/youtube/totem-youtube.c (resolve_t_param), - (thumbnail_loaded_cb), (thumbnail_opened_cb), - (open_in_web_browser_activate_cb): Fixed compatibility problems - with libgdata 0.4.0 and removed some unnecessary error dialogues from - the YouTube plugin. - - ChangeLog | 8 ++++++++ - src/plugins/youtube/totem-youtube.c | 20 ++++++-------------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit 1e7eb412f155459d1cd13e4606450bf3fd31b337 -Author: Philip Withnall -Date: Mon Jul 20 22:39:45 2009 +0100 - - Homogenise the Local Search plugin's appearance with Jamendo and YouTube - - 2009-07-20 Philip Withnall - - * src/plugins/tracker/totem-tracker-widget.c - (totem_tracker_widget_init): Homogenise the Local Search plugin's - appearance with the Jamendo and YouTube plugins. (Closes: #572292) - - ChangeLog | 6 ++++++ - src/plugins/tracker/totem-tracker-widget.c | 11 ++--------- - 2 files changed, 8 insertions(+), 9 deletions(-) - -commit c2db8b70b879529392b8b98a6ec27991c1c1dd83 -Author: Philip Withnall -Date: Mon Jul 20 22:28:13 2009 +0100 - - Limit the Tracker versions we build against to 0.6.x - - 2009-07-20 Philip Withnall - - * configure.in: Limit the Tracker versions we can build the Local - Search plugin against to 0.6.x. (Closes: #580726) - - ChangeLog | 5 +++++ - configure.in | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit 4f9691981084af4a358e658a7b5addba00cf9a92 -Author: Philip Withnall -Date: Mon Jul 20 22:21:24 2009 +0100 - - Build the docs first, and the code last - - 2009-07-20 Philip Withnall - - * Makefile.am: Build the docs first, and the code last - - ChangeLog | 4 ++++ - Makefile.am | 2 +- - 2 files changed, 5 insertions(+), 1 deletions(-) diff -Nru totem-2.30.0git20100413/config.guess totem-2.30.1/config.guess diff -Nru totem-2.30.0git20100413/config.h.in totem-2.30.1/config.h.in --- totem-2.30.0git20100413/config.h.in 2010-04-14 12:10:49.000000000 +0200 +++ totem-2.30.1/config.h.in 2010-04-27 11:25:23.000000000 +0200 @@ -36,6 +36,9 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES +/* Define if libgdata >= 0.7.0 is available */ +#undef HAVE_LIBGDATA_0_7 + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H diff -Nru totem-2.30.0git20100413/config.sub totem-2.30.1/config.sub diff -Nru totem-2.30.0git20100413/configure totem-2.30.1/configure diff -Nru totem-2.30.0git20100413/configure.in totem-2.30.1/configure.in --- totem-2.30.0git20100413/configure.in 2010-04-14 12:09:25.000000000 +0200 +++ totem-2.30.1/configure.in 2010-04-27 11:17:40.000000000 +0200 @@ -2,7 +2,7 @@ m4_define(totem_version_major, 2) m4_define(totem_version_minor, 30) -m4_define(totem_version_micro, 0) +m4_define(totem_version_micro, 1) AC_INIT([totem], [totem_version_major.totem_version_minor.totem_version_micro], @@ -60,7 +60,7 @@ dnl the two versions here implicate the gstreamer core and gst-plugins dnl release versions. GST_MAJORMINOR=0.10 -GST_REQS=0.10.26 +GST_REQS=0.10.28.1 GSTPLUG_REQS=0.10.26 HAVE_GSTREAMER=no @@ -545,6 +545,13 @@ add_plugin="0" fi + # For timeout support. Remove this once we depend on libgdata >= 0.7.0 + PKG_CHECK_MODULES(LIBGDATA_0_7, libgdata >= 0.7.0, + [HAVE_LIBGDATA_0_7=yes], [HAVE_LIBGDATA_0_7=no]) + if test "${HAVE_LIBGDATA_0_7}" = "yes" ; then + AC_DEFINE([HAVE_LIBGDATA_0_7],[1],[Define if libgdata >= 0.7.0 is available]) + fi + dnl We need the souphttpsrc element for the YouTube plugin AC_MSG_CHECKING([GStreamer 0.10 souphttpsrc plugin]) if $gst010_inspect souphttpsrc >/dev/null 2>/dev/null; then diff -Nru totem-2.30.0git20100413/data/icons/16x16/Makefile.in totem-2.30.1/data/icons/16x16/Makefile.in diff -Nru totem-2.30.0git20100413/data/icons/22x22/Makefile.in totem-2.30.1/data/icons/22x22/Makefile.in diff -Nru totem-2.30.0git20100413/data/icons/24x24/Makefile.in totem-2.30.1/data/icons/24x24/Makefile.in diff -Nru totem-2.30.0git20100413/data/icons/32x32/Makefile.in totem-2.30.1/data/icons/32x32/Makefile.in diff -Nru totem-2.30.0git20100413/data/icons/48x48/Makefile.in totem-2.30.1/data/icons/48x48/Makefile.in diff -Nru totem-2.30.0git20100413/data/icons/Makefile.in totem-2.30.1/data/icons/Makefile.in diff -Nru totem-2.30.0git20100413/data/icons/scalable/Makefile.in totem-2.30.1/data/icons/scalable/Makefile.in diff -Nru totem-2.30.0git20100413/data/Makefile.in totem-2.30.1/data/Makefile.in diff -Nru totem-2.30.0git20100413/debian/changelog totem-2.30.1/debian/changelog --- totem-2.30.0git20100413/debian/changelog 2010-04-28 16:01:53.000000000 +0200 +++ totem-2.30.1/debian/changelog 2010-04-28 16:01:54.000000000 +0200 @@ -1,3 +1,26 @@ +totem (2.30.1-0ubuntu1) lucid-proposed; urgency=low + + [ Martin Pitt ] + * New upstream bug fix release. Changes since our last git snapshot: + - Fix crashes on exit. + - Fix possible crasher when PyGTK isn't available. (LP: #367573) + - Require gstreamer 0.10.28.1 for queue2 fixes. + - Fix Youtube search lasting forever while playing Video. (LP: #559862) + - Fix artifacts or black screen when paused. (LP: #535426) + - Translation updates. + * 90_autotools.patch: Refresh for new upstream version. + * 90_autotools.patch: Revert upstream change of bumping gstreamer + dependency to 0.10.28.1; set it back to 0.10.28. There are no queue2 + related changes in totem since our previous git snapshot, so this can't + make a difference. + + [ Loïc Minier ] + * totem.preinst: Actually remove alternatives by checking for action + "upgrade" instead of "configure" which isn't used with preinsts; bump + version to 2.30.0git20100413-0ubuntu2 for that to be effective. + + -- Martin Pitt Wed, 28 Apr 2010 15:58:47 +0200 + totem (2.30.0git20100413-0ubuntu1) lucid; urgency=low * Updated to a git snapshot since 2.30.1 will be after the freeze for lucid: diff -Nru totem-2.30.0git20100413/debian/patches/90_autotools.patch totem-2.30.1/debian/patches/90_autotools.patch --- totem-2.30.0git20100413/debian/patches/90_autotools.patch 2010-04-28 16:01:53.000000000 +0200 +++ totem-2.30.1/debian/patches/90_autotools.patch 2010-04-28 16:01:54.000000000 +0200 @@ -1,6 +1,7 @@ -diff -Nur totem-2.30.0git20100413/bindings/Makefile.in totem-2.30.0git20100413.ubuntu/bindings/Makefile.in ---- totem-2.30.0git20100413/bindings/Makefile.in 2010-04-14 12:10:49.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/bindings/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/bindings/Makefile.in +=================================================================== +--- totem-2.30.1.orig/bindings/Makefile.in 2010-04-27 11:24:49.000000000 +0200 ++++ totem-2.30.1/bindings/Makefile.in 2010-04-28 15:55:30.577226513 +0200 @@ -109,6 +109,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -10,9 +11,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/bindings/python/Makefile.in totem-2.30.0git20100413.ubuntu/bindings/python/Makefile.in ---- totem-2.30.0git20100413/bindings/python/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/bindings/python/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/bindings/python/Makefile.in +=================================================================== +--- totem-2.30.1.orig/bindings/python/Makefile.in 2010-04-27 11:24:49.000000000 +0200 ++++ totem-2.30.1/bindings/python/Makefile.in 2010-04-28 15:55:30.577226513 +0200 @@ -106,6 +106,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -22,9 +24,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/bindings/vala/Makefile.in totem-2.30.0git20100413.ubuntu/bindings/vala/Makefile.in ---- totem-2.30.0git20100413/bindings/vala/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/bindings/vala/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/bindings/vala/Makefile.in +=================================================================== +--- totem-2.30.1.orig/bindings/vala/Makefile.in 2010-04-27 11:24:49.000000000 +0200 ++++ totem-2.30.1/bindings/vala/Makefile.in 2010-04-28 15:55:30.577226513 +0200 @@ -70,6 +70,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -34,9 +37,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/browser-plugin/Makefile.in totem-2.30.0git20100413.ubuntu/browser-plugin/Makefile.in ---- totem-2.30.0git20100413/browser-plugin/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/browser-plugin/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/browser-plugin/Makefile.in +=================================================================== +--- totem-2.30.1.orig/browser-plugin/Makefile.in 2010-04-27 11:24:50.000000000 +0200 ++++ totem-2.30.1/browser-plugin/Makefile.in 2010-04-28 15:55:30.587224920 +0200 @@ -304,6 +304,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -46,10 +50,11 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/configure totem-2.30.0git20100413.ubuntu/configure ---- totem-2.30.0git20100413/configure 2010-04-14 12:10:15.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/configure 2010-04-14 12:45:04.000000000 +0200 -@@ -813,6 +813,8 @@ +Index: totem-2.30.1/configure +=================================================================== +--- totem-2.30.1.orig/configure 2010-04-27 11:25:00.000000000 +0200 ++++ totem-2.30.1/configure 2010-04-28 15:55:39.977227698 +0200 +@@ -807,6 +807,8 @@ LIBEPC_CFLAGS BEMUSED_LIBS BEMUSED_CFLAGS @@ -58,7 +63,7 @@ GMYTH_LIBS GMYTH_CFLAGS LIRC_LIBS -@@ -1140,6 +1142,8 @@ +@@ -1132,6 +1134,8 @@ MEDIA_PLAYER_KEYS_LIBS GMYTH_CFLAGS GMYTH_LIBS @@ -67,7 +72,7 @@ BEMUSED_CFLAGS BEMUSED_LIBS LIBEPC_CFLAGS -@@ -1908,6 +1912,8 @@ +@@ -1900,6 +1904,8 @@ GMYTH_CFLAGS C compiler flags for GMYTH, overriding pkg-config GMYTH_LIBS linker flags for GMYTH, overriding pkg-config @@ -76,149 +81,7 @@ BEMUSED_CFLAGS C compiler flags for BEMUSED, overriding pkg-config BEMUSED_LIBS -@@ -7317,13 +7323,13 @@ - else - lt_cv_nm_interface="BSD nm" - echo "int some_variable = 0;" > conftest.$ac_ext -- (eval echo "\"\$as_me:7320: $ac_compile\"" >&5) -+ (eval echo "\"\$as_me:7326: $ac_compile\"" >&5) - (eval "$ac_compile" 2>conftest.err) - cat conftest.err >&5 -- (eval echo "\"\$as_me:7323: $NM \\\"conftest.$ac_objext\\\"\"" >&5) -+ (eval echo "\"\$as_me:7329: $NM \\\"conftest.$ac_objext\\\"\"" >&5) - (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) - cat conftest.err >&5 -- (eval echo "\"\$as_me:7326: output\"" >&5) -+ (eval echo "\"\$as_me:7332: output\"" >&5) - cat conftest.out >&5 - if $GREP 'External.*some_variable' conftest.out > /dev/null; then - lt_cv_nm_interface="MS dumpbin" -@@ -8517,7 +8523,7 @@ - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 8520 "configure"' > conftest.$ac_ext -+ echo '#line 8526 "configure"' > conftest.$ac_ext - if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 - (eval $ac_compile) 2>&5 - ac_status=$? -@@ -10302,11 +10308,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10305: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10311: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10309: \$? = $ac_status" >&5 -+ echo "$as_me:10315: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -10641,11 +10647,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10644: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10650: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:10648: \$? = $ac_status" >&5 -+ echo "$as_me:10654: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -10746,11 +10752,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10749: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10755: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10753: \$? = $ac_status" >&5 -+ echo "$as_me:10759: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -10801,11 +10807,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:10804: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:10810: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:10808: \$? = $ac_status" >&5 -+ echo "$as_me:10814: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -13185,7 +13191,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 13188 "configure" -+#line 13194 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -13281,7 +13287,7 @@ - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <<_LT_EOF --#line 13284 "configure" -+#line 13290 "configure" - #include "confdefs.h" - - #if HAVE_DLFCN_H -@@ -15237,11 +15243,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15240: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15246: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "$as_me:15244: \$? = $ac_status" >&5 -+ echo "$as_me:15250: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -15336,11 +15342,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15339: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15345: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15343: \$? = $ac_status" >&5 -+ echo "$as_me:15349: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -15388,11 +15394,11 @@ - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"\$as_me:15391: $lt_compile\"" >&5) -+ (eval echo "\"\$as_me:15397: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "$as_me:15395: \$? = $ac_status" >&5 -+ echo "$as_me:15401: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -18192,7 +18198,7 @@ +@@ -18162,13 +18168,13 @@ # The full list of plugins @@ -227,7 +90,14 @@ PLUGINDIR='${libdir}/totem/plugins' -@@ -18636,7 +18642,8 @@ + + GST_MAJORMINOR=0.10 +-GST_REQS=0.10.28.1 ++GST_REQS=0.10.28 + GSTPLUG_REQS=0.10.26 + + HAVE_GSTREAMER=no +@@ -18593,7 +18599,8 @@ gconf-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -237,7 +107,7 @@ ($PKG_CONFIG --exists --print-errors " glib-2.0 >= $GLIB_REQS gio-2.0 -@@ -18645,7 +18652,8 @@ +@@ -18602,7 +18609,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -247,7 +117,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -@@ -18657,7 +18665,8 @@ +@@ -18614,7 +18622,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -257,7 +127,7 @@ else pkg_failed=yes fi -@@ -18678,7 +18687,8 @@ +@@ -18633,7 +18642,8 @@ gconf-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -267,7 +137,7 @@ ($PKG_CONFIG --exists --print-errors " glib-2.0 >= $GLIB_REQS gio-2.0 -@@ -18687,7 +18697,8 @@ +@@ -18642,7 +18652,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -277,7 +147,7 @@ ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then -@@ -18699,7 +18710,8 @@ +@@ -18654,7 +18665,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -287,27 +157,27 @@ else pkg_failed=yes fi -@@ -18726,7 +18738,8 @@ +@@ -18680,7 +18692,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 -- cairo"` +- cairo" 2>&1` + cairo -+ launchpad-integration"` ++ launchpad-integration" 2>&1` else - DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " + DEPENDENCY_PKG_ERRORS=`$PKG_CONFIG --print-errors " glib-2.0 >= $GLIB_REQS -@@ -18736,7 +18749,8 @@ +@@ -18690,7 +18703,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 -- cairo"` +- cairo" 2>&1` + cairo -+ launchpad-integration"` ++ launchpad-integration" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DEPENDENCY_PKG_ERRORS" >&5 -@@ -18749,7 +18763,8 @@ +@@ -18703,7 +18717,8 @@ gconf-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS gstreamer-tag-0.10 >= 0.10.26 @@ -317,7 +187,7 @@ $DEPENDENCY_PKG_ERRORS -@@ -20450,6 +20465,100 @@ +@@ -20364,6 +20379,100 @@ add_plugin="0" fi ;; @@ -418,7 +288,7 @@ bemused) pkg_failed=no -@@ -22214,7 +22323,7 @@ +@@ -22032,7 +22141,7 @@ @@ -427,7 +297,7 @@ cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure -@@ -23392,6 +23501,7 @@ +@@ -23198,6 +23307,7 @@ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;; @@ -435,9 +305,10 @@ "src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;; "src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;; "src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;; -diff -Nur totem-2.30.0git20100413/data/icons/16x16/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/16x16/Makefile.in ---- totem-2.30.0git20100413/data/icons/16x16/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/16x16/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/16x16/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/16x16/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/16x16/Makefile.in 2010-04-28 15:55:30.637245663 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -447,9 +318,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/icons/22x22/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/22x22/Makefile.in ---- totem-2.30.0git20100413/data/icons/22x22/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/22x22/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/22x22/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/22x22/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/22x22/Makefile.in 2010-04-28 15:55:30.637245663 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -459,9 +331,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/icons/24x24/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/24x24/Makefile.in ---- totem-2.30.0git20100413/data/icons/24x24/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/24x24/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/24x24/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/24x24/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/24x24/Makefile.in 2010-04-28 15:55:30.647226261 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -471,9 +344,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/icons/32x32/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/32x32/Makefile.in ---- totem-2.30.0git20100413/data/icons/32x32/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/32x32/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/32x32/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/32x32/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/32x32/Makefile.in 2010-04-28 15:55:30.647226261 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -483,9 +357,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/icons/48x48/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/48x48/Makefile.in ---- totem-2.30.0git20100413/data/icons/48x48/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/48x48/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/48x48/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/48x48/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/48x48/Makefile.in 2010-04-28 15:55:30.647226261 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -495,9 +370,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/icons/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/Makefile.in ---- totem-2.30.0git20100413/data/icons/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/Makefile.in 2010-04-28 15:55:30.647226261 +0200 @@ -107,6 +107,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -507,9 +383,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/icons/scalable/Makefile.in totem-2.30.0git20100413.ubuntu/data/icons/scalable/Makefile.in ---- totem-2.30.0git20100413/data/icons/scalable/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/icons/scalable/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/icons/scalable/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/icons/scalable/Makefile.in 2010-04-27 11:24:51.000000000 +0200 ++++ totem-2.30.1/data/icons/scalable/Makefile.in 2010-04-28 15:55:30.647226261 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -519,9 +396,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/data/Makefile.in totem-2.30.0git20100413.ubuntu/data/Makefile.in ---- totem-2.30.0git20100413/data/Makefile.in 2010-04-14 12:10:50.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/data/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/data/Makefile.in +=================================================================== +--- totem-2.30.1.orig/data/Makefile.in 2010-04-27 11:24:50.000000000 +0200 ++++ totem-2.30.1/data/Makefile.in 2010-04-28 15:55:30.647226261 +0200 @@ -141,6 +141,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -531,9 +409,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/docs/Makefile.in totem-2.30.0git20100413.ubuntu/docs/Makefile.in ---- totem-2.30.0git20100413/docs/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/docs/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/docs/Makefile.in +=================================================================== +--- totem-2.30.1.orig/docs/Makefile.in 2010-04-27 11:24:52.000000000 +0200 ++++ totem-2.30.1/docs/Makefile.in 2010-04-28 15:55:30.657225577 +0200 @@ -107,6 +107,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -543,9 +422,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/docs/reference/Makefile.in totem-2.30.0git20100413.ubuntu/docs/reference/Makefile.in ---- totem-2.30.0git20100413/docs/reference/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/docs/reference/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/docs/reference/Makefile.in +=================================================================== +--- totem-2.30.1.orig/docs/reference/Makefile.in 2010-04-27 11:24:52.000000000 +0200 ++++ totem-2.30.1/docs/reference/Makefile.in 2010-04-28 15:55:30.657225577 +0200 @@ -76,6 +76,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -555,9 +435,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/help/Makefile.in totem-2.30.0git20100413.ubuntu/help/Makefile.in ---- totem-2.30.0git20100413/help/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/help/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/help/Makefile.in +=================================================================== +--- totem-2.30.1.orig/help/Makefile.in 2010-04-27 11:24:52.000000000 +0200 ++++ totem-2.30.1/help/Makefile.in 2010-04-28 15:55:30.657225577 +0200 @@ -92,6 +92,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -567,9 +448,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/lib/Makefile.in totem-2.30.0git20100413.ubuntu/lib/Makefile.in ---- totem-2.30.0git20100413/lib/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/lib/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/lib/Makefile.in +=================================================================== +--- totem-2.30.1.orig/lib/Makefile.in 2010-04-27 11:24:52.000000000 +0200 ++++ totem-2.30.1/lib/Makefile.in 2010-04-28 15:55:30.657225577 +0200 @@ -104,6 +104,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -579,9 +461,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/Makefile.in totem-2.30.0git20100413.ubuntu/Makefile.in ---- totem-2.30.0git20100413/Makefile.in 2010-04-14 12:10:55.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/Makefile.in +=================================================================== +--- totem-2.30.1.orig/Makefile.in 2010-04-27 11:24:58.000000000 +0200 ++++ totem-2.30.1/Makefile.in 2010-04-28 15:55:30.657225577 +0200 @@ -124,6 +124,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -591,9 +474,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/backend/Makefile.in totem-2.30.0git20100413.ubuntu/src/backend/Makefile.in ---- totem-2.30.0git20100413/src/backend/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/backend/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/backend/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/backend/Makefile.in 2010-04-27 11:24:53.000000000 +0200 ++++ totem-2.30.1/src/backend/Makefile.in 2010-04-28 15:55:30.667221051 +0200 @@ -121,6 +121,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -603,9 +487,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/Makefile.in totem-2.30.0git20100413.ubuntu/src/Makefile.in ---- totem-2.30.0git20100413/src/Makefile.in 2010-04-14 12:10:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/Makefile.in 2010-04-27 11:24:53.000000000 +0200 ++++ totem-2.30.1/src/Makefile.in 2010-04-28 15:55:30.667221051 +0200 @@ -343,6 +343,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -615,9 +500,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/bbc/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/bbc/Makefile.in ---- totem-2.30.0git20100413/src/plugins/bbc/Makefile.in 2010-04-14 12:44:51.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/bbc/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/bbc/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/bbc/Makefile.in 2010-04-28 15:55:30.547203634 +0200 ++++ totem-2.30.1/src/plugins/bbc/Makefile.in 2010-04-28 15:55:30.667221051 +0200 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. @@ -939,9 +825,10 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -diff -Nur totem-2.30.0git20100413/src/plugins/bemused/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/bemused/Makefile.in ---- totem-2.30.0git20100413/src/plugins/bemused/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/bemused/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/bemused/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/bemused/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/bemused/Makefile.in 2010-04-28 15:55:30.667221051 +0200 @@ -125,6 +125,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -951,9 +838,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/brasero-disc-recorder/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/brasero-disc-recorder/Makefile.in ---- totem-2.30.0git20100413/src/plugins/brasero-disc-recorder/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/brasero-disc-recorder/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/brasero-disc-recorder/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/brasero-disc-recorder/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/brasero-disc-recorder/Makefile.in 2010-04-28 15:55:30.667221051 +0200 @@ -128,6 +128,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -963,9 +851,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/coherence_upnp/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/coherence_upnp/Makefile.in ---- totem-2.30.0git20100413/src/plugins/coherence_upnp/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/coherence_upnp/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/coherence_upnp/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/coherence_upnp/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/coherence_upnp/Makefile.in 2010-04-28 15:55:30.679703573 +0200 @@ -93,6 +93,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -975,9 +864,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/dbus-service/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/dbus-service/Makefile.in ---- totem-2.30.0git20100413/src/plugins/dbus-service/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/dbus-service/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/dbus-service/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/dbus-service/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/dbus-service/Makefile.in 2010-04-28 15:55:30.679703573 +0200 @@ -93,6 +93,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -987,9 +877,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/galago/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/galago/Makefile.in ---- totem-2.30.0git20100413/src/plugins/galago/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/galago/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/galago/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/galago/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/galago/Makefile.in 2010-04-28 15:55:30.679703573 +0200 @@ -125,6 +125,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -999,9 +890,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/gromit/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/gromit/Makefile.in ---- totem-2.30.0git20100413/src/plugins/gromit/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/gromit/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/gromit/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/gromit/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/gromit/Makefile.in 2010-04-28 15:55:30.679703573 +0200 @@ -124,6 +124,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1011,9 +903,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/iplayer/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/iplayer/Makefile.in ---- totem-2.30.0git20100413/src/plugins/iplayer/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/iplayer/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/iplayer/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/iplayer/Makefile.in 2010-04-27 11:24:54.000000000 +0200 ++++ totem-2.30.1/src/plugins/iplayer/Makefile.in 2010-04-28 15:55:30.679703573 +0200 @@ -94,6 +94,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1023,9 +916,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/jamendo/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/jamendo/Makefile.in ---- totem-2.30.0git20100413/src/plugins/jamendo/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/jamendo/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/jamendo/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/jamendo/Makefile.in 2010-04-27 11:24:55.000000000 +0200 ++++ totem-2.30.1/src/plugins/jamendo/Makefile.in 2010-04-28 15:55:30.679703573 +0200 @@ -94,6 +94,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1035,9 +929,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/lirc/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/lirc/Makefile.in ---- totem-2.30.0git20100413/src/plugins/lirc/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/lirc/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/lirc/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/lirc/Makefile.in 2010-04-27 11:24:55.000000000 +0200 ++++ totem-2.30.1/src/plugins/lirc/Makefile.in 2010-04-28 15:55:30.689704076 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1047,9 +942,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/Makefile.in ---- totem-2.30.0git20100413/src/plugins/Makefile.in 2010-04-14 12:10:52.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/Makefile.in 2010-04-27 11:24:53.000000000 +0200 ++++ totem-2.30.1/src/plugins/Makefile.in 2010-04-28 15:55:30.689704076 +0200 @@ -167,6 +167,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1059,9 +955,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/media-player-keys/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/media-player-keys/Makefile.in ---- totem-2.30.0git20100413/src/plugins/media-player-keys/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/media-player-keys/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/media-player-keys/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/media-player-keys/Makefile.in 2010-04-27 11:24:55.000000000 +0200 ++++ totem-2.30.1/src/plugins/media-player-keys/Makefile.in 2010-04-28 15:55:30.689704076 +0200 @@ -130,6 +130,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1071,9 +968,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/mythtv/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/mythtv/Makefile.in ---- totem-2.30.0git20100413/src/plugins/mythtv/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/mythtv/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/mythtv/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/mythtv/Makefile.in 2010-04-27 11:24:55.000000000 +0200 ++++ totem-2.30.1/src/plugins/mythtv/Makefile.in 2010-04-28 15:55:30.689704076 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1083,9 +981,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/ontop/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/ontop/Makefile.in ---- totem-2.30.0git20100413/src/plugins/ontop/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/ontop/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/ontop/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/ontop/Makefile.in 2010-04-27 11:24:56.000000000 +0200 ++++ totem-2.30.1/src/plugins/ontop/Makefile.in 2010-04-28 15:55:30.689704076 +0200 @@ -124,6 +124,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1095,9 +994,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/opensubtitles/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/opensubtitles/Makefile.in ---- totem-2.30.0git20100413/src/plugins/opensubtitles/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/opensubtitles/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/opensubtitles/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/opensubtitles/Makefile.in 2010-04-27 11:24:56.000000000 +0200 ++++ totem-2.30.1/src/plugins/opensubtitles/Makefile.in 2010-04-28 15:55:30.689704076 +0200 @@ -94,6 +94,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1107,9 +1007,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/properties/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/properties/Makefile.in ---- totem-2.30.0git20100413/src/plugins/properties/Makefile.in 2010-04-14 12:10:53.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/properties/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/properties/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/properties/Makefile.in 2010-04-27 11:24:56.000000000 +0200 ++++ totem-2.30.1/src/plugins/properties/Makefile.in 2010-04-28 15:55:30.699719805 +0200 @@ -137,6 +137,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1119,9 +1020,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/publish/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/publish/Makefile.in ---- totem-2.30.0git20100413/src/plugins/publish/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/publish/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/publish/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/publish/Makefile.in 2010-04-27 11:24:56.000000000 +0200 ++++ totem-2.30.1/src/plugins/publish/Makefile.in 2010-04-28 15:55:30.699719805 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1131,9 +1033,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/pythonconsole/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/pythonconsole/Makefile.in ---- totem-2.30.0git20100413/src/plugins/pythonconsole/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/pythonconsole/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/pythonconsole/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/pythonconsole/Makefile.in 2010-04-27 11:24:56.000000000 +0200 ++++ totem-2.30.1/src/plugins/pythonconsole/Makefile.in 2010-04-28 15:55:30.699719805 +0200 @@ -93,6 +93,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1143,9 +1046,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/sample-python/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/sample-python/Makefile.in ---- totem-2.30.0git20100413/src/plugins/sample-python/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/sample-python/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/sample-python/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/sample-python/Makefile.in 2010-04-27 11:24:56.000000000 +0200 ++++ totem-2.30.1/src/plugins/sample-python/Makefile.in 2010-04-28 15:55:30.699719805 +0200 @@ -67,6 +67,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1155,9 +1059,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/sample-vala/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/sample-vala/Makefile.in ---- totem-2.30.0git20100413/src/plugins/sample-vala/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/sample-vala/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/sample-vala/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/sample-vala/Makefile.in 2010-04-27 11:24:57.000000000 +0200 ++++ totem-2.30.1/src/plugins/sample-vala/Makefile.in 2010-04-28 15:55:30.699719805 +0200 @@ -129,6 +129,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1167,9 +1072,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/screensaver/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/screensaver/Makefile.in ---- totem-2.30.0git20100413/src/plugins/screensaver/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/screensaver/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/screensaver/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/screensaver/Makefile.in 2010-04-27 11:24:57.000000000 +0200 ++++ totem-2.30.1/src/plugins/screensaver/Makefile.in 2010-04-28 15:55:30.699719805 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1179,9 +1085,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/screenshot/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/screenshot/Makefile.in ---- totem-2.30.0git20100413/src/plugins/screenshot/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/screenshot/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/screenshot/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/screenshot/Makefile.in 2010-04-27 11:24:57.000000000 +0200 ++++ totem-2.30.1/src/plugins/screenshot/Makefile.in 2010-04-28 15:55:30.709766822 +0200 @@ -131,6 +131,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1191,9 +1098,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/sidebar-test/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/sidebar-test/Makefile.in ---- totem-2.30.0git20100413/src/plugins/sidebar-test/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/sidebar-test/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/sidebar-test/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/sidebar-test/Makefile.in 2010-04-27 11:24:57.000000000 +0200 ++++ totem-2.30.1/src/plugins/sidebar-test/Makefile.in 2010-04-28 15:55:30.709766822 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1203,9 +1111,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/skipto/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/skipto/Makefile.in ---- totem-2.30.0git20100413/src/plugins/skipto/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/skipto/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/skipto/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/skipto/Makefile.in 2010-04-27 11:24:57.000000000 +0200 ++++ totem-2.30.1/src/plugins/skipto/Makefile.in 2010-04-28 15:55:30.709766822 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1215,9 +1124,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/thumbnail/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/thumbnail/Makefile.in ---- totem-2.30.0git20100413/src/plugins/thumbnail/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/thumbnail/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/thumbnail/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/thumbnail/Makefile.in 2010-04-27 11:24:58.000000000 +0200 ++++ totem-2.30.1/src/plugins/thumbnail/Makefile.in 2010-04-28 15:55:30.709766822 +0200 @@ -125,6 +125,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1227,9 +1137,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/totem/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/totem/Makefile.in ---- totem-2.30.0git20100413/src/plugins/totem/Makefile.in 2010-04-14 12:10:54.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/totem/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/totem/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/totem/Makefile.in 2010-04-27 11:24:58.000000000 +0200 ++++ totem-2.30.1/src/plugins/totem/Makefile.in 2010-04-28 15:55:30.709766822 +0200 @@ -91,6 +91,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1239,9 +1150,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/tracker/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/tracker/Makefile.in ---- totem-2.30.0git20100413/src/plugins/tracker/Makefile.in 2010-04-14 12:10:55.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/tracker/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/tracker/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/tracker/Makefile.in 2010-04-27 11:24:58.000000000 +0200 ++++ totem-2.30.1/src/plugins/tracker/Makefile.in 2010-04-28 15:55:30.709766822 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -1251,9 +1163,10 @@ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@ BEMUSED_LIBS = @BEMUSED_LIBS@ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@ -diff -Nur totem-2.30.0git20100413/src/plugins/youtube/Makefile.in totem-2.30.0git20100413.ubuntu/src/plugins/youtube/Makefile.in ---- totem-2.30.0git20100413/src/plugins/youtube/Makefile.in 2010-04-14 12:10:55.000000000 +0200 -+++ totem-2.30.0git20100413.ubuntu/src/plugins/youtube/Makefile.in 2010-04-14 12:45:04.000000000 +0200 +Index: totem-2.30.1/src/plugins/youtube/Makefile.in +=================================================================== +--- totem-2.30.1.orig/src/plugins/youtube/Makefile.in 2010-04-27 11:24:58.000000000 +0200 ++++ totem-2.30.1/src/plugins/youtube/Makefile.in 2010-04-28 15:55:30.719725001 +0200 @@ -126,6 +126,8 @@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ diff -Nru totem-2.30.0git20100413/debian/totem.preinst totem-2.30.1/debian/totem.preinst --- totem-2.30.0git20100413/debian/totem.preinst 2010-04-28 16:01:53.000000000 +0200 +++ totem-2.30.1/debian/totem.preinst 2010-04-28 16:01:54.000000000 +0200 @@ -1,7 +1,8 @@ #! /bin/sh set -e -if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "2.27.1-2" ; then +# can be dropped after lucid is released +if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt "2.30.0git20100413-0ubuntu2" ; then update-alternatives --quiet --remove-all gnome-video-thumbnailer || true update-alternatives --quiet --remove-all totem || true fi diff -Nru totem-2.30.0git20100413/docs/Makefile.in totem-2.30.1/docs/Makefile.in diff -Nru totem-2.30.0git20100413/docs/reference/html/api-index-deprecated.html totem-2.30.1/docs/reference/html/api-index-deprecated.html diff -Nru totem-2.30.0git20100413/docs/reference/html/api-index-full.html totem-2.30.1/docs/reference/html/api-index-full.html diff -Nru totem-2.30.0git20100413/docs/reference/html/BaconVideoWidget.html totem-2.30.1/docs/reference/html/BaconVideoWidget.html diff -Nru totem-2.30.0git20100413/docs/reference/html/core-api.html totem-2.30.1/docs/reference/html/core-api.html diff -Nru totem-2.30.0git20100413/docs/reference/html/index.html totem-2.30.1/docs/reference/html/index.html diff -Nru totem-2.30.0git20100413/docs/reference/html/index.sgml totem-2.30.1/docs/reference/html/index.sgml diff -Nru totem-2.30.0git20100413/docs/reference/html/style.css totem-2.30.1/docs/reference/html/style.css --- totem-2.30.0git20100413/docs/reference/html/style.css 2010-04-14 12:16:32.000000000 +0200 +++ totem-2.30.1/docs/reference/html/style.css 2010-04-27 11:38:11.000000000 +0200 @@ -1,15 +1,13 @@ .synopsis, .classsynopsis { - /* tango:aluminium 1/2 */ - background: #eeeeec; - border: solid 1px #d3d7cf; + background: #eeeeee; + border: solid 1px #aaaaaa; padding: 0.5em; } .programlisting { - /* tango:sky blue 0/1 */ - background: #e6f3ff; - border: solid 1px #729fcf; + background: #eeeeff; + border: solid 1px #aaaaff; padding: 0.5em; } .variablelist @@ -22,63 +20,64 @@ vertical-align: top; } +/* this is needed so that the local anchors are displayed below the naviagtion */ @media screen { sup a.footnote { position: relative; top: 0em ! important; - } - /* this is needed so that the local anchors are displayed below the naviagtion */ - div.footnote a[name], div.refnamediv a[name], div.refsect1 a[name], div.refsect2 a[name], div.index a[name], div.glossary a[name], div.sect1 a[name] + div.refnamediv a[name], div.refsect1 a[name] { position: relative; - padding-top:4.5em; + top: -4.5em; } - /* this seems to be a bug in the xsl style sheets when generating indexes */ - div.index div.index - { - top: 0em; - } - /* make space for the fixed navigation bar and add space at the bottom so that - * link targets appear somewhat close to top - */ - body - { - padding-top: 3.2em; - padding-bottom: 20em; - } - /* style and size the navigation bar */ table.navigation#top { - position: fixed; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; + background: #ffeeee; + border: solid 1px #ffaaaa; margin-top: 0; margin-bottom: 0; + position: fixed; top: 0; left: 0; - height: 3em; - z-index: 10; + height: 2em; + z-index: 1; } - .navigation a, .navigation a:visited + .navigation a { - /* tango:scarlet red 3 */ - color: #a40000; + color: #770000; } - .navigation a:hover + .navigation a:visited { - /* tango:scarlet red 1 */ - color: #ef2929; + color: #550000; } td.shortcuts { - /* tango:scarlet red 1 */ - color: #ef2929; + color: #770000; font-size: 80%; white-space: nowrap; } + div.refentry, div.chapter, div.reference, div.part, div.book, div.glossary, div.sect1, div.appendix, div.preface + { + position: relative; + top: 3em; + z-index: 0; + } + div.glossary, div.index + { + position: relative; + top: 2em; + z-index: 0; + } + div.refnamediv + { + margin-top: 2em; + } + body + { + padding-bottom: 20em; + } } @media print { table.navigation { @@ -88,14 +87,13 @@ div.titlepage table.navigation { visibility: visible; display: table; - /* tango:scarlet red 0/1 */ - background: #ffe6e6; - border: solid 1px #ef2929; + background: #ffeeee; + border: solid 1px #ffaaaa; margin-top: 0; margin-bottom: 0; top: 0; left: 0; - height: 3em; + height: 2em; } } @@ -104,6 +102,7 @@ font-size: 200%; } + div.gallery-float { float: left; @@ -117,48 +116,44 @@ { clear: both; } - -a, a:visited +a { text-decoration: none; - /* tango:sky blue 2 */ - color: #3465a4; } a:hover { text-decoration: underline; - /* tango:sky blue 1 */ - color: #729fcf; + color: #FF0000; } div.table table { border-collapse: collapse; border-spacing: 0px; - /* tango:aluminium 3 */ - border: solid 1px #babdb6; + border-style: solid; + border-color: #777777; + border-width: 1px; } div.table table td, div.table table th { - /* tango:aluminium 3 */ - border: solid 1px #babdb6; + border-style: solid; + border-color: #777777; + border-width: 1px; padding: 3px; vertical-align: top; } div.table table th { - /* tango:aluminium 2 */ - background-color: #d3d7cf; + background-color: #eeeeee; } hr { - /* tango:aluminium 3 */ - color: #babdb6; - background: #babdb6; - border: none 0px; + color: #777777; + background: #777777; + border: 0; height: 1px; clear: both; } @@ -166,92 +161,7 @@ .footer { padding-top: 3.5em; - /* tango:aluminium 3 */ - color: #babdb6; + color: #777777; text-align: center; font-size: 80%; } - -.warning -{ - /* tango:orange 0/1 */ - background: #ffeed9; - border-color: #ffb04f; -} -.note -{ - /* tango:chameleon 0/0.5 */ - background: #d8ffb2; - border-color: #abf562; -} -.note, .warning -{ - padding: 0.5em; - border-width: 1px; - border-style: solid; -} -.note h3, .warning h3 -{ - margin-top: 0.0em -} -.note p, .warning p -{ - margin-bottom: 0.0em -} - -/* blob links */ -h2 .extralinks, h3 .extralinks -{ - float: right; - /* tango:aluminium 3 */ - color: #babdb6; - font-size: 80%; - font-weight: normal; -} - -/* code listings */ - -.listing_code .programlisting .cbracket { color: #a40000; } /* tango: scarlet red 3 */ -.listing_code .programlisting .comment { color: #a1a39d; } /* tango: aluminium 4 */ -.listing_code .programlisting .function { color: #000000; font-weight: bold; } -.listing_code .programlisting .function a { color: #11326b; font-weight: bold; } /* tango: sky blue 4 */ -.listing_code .programlisting .keyword { color: #4e9a06; } /* tango: chameleon 3 */ -.listing_code .programlisting .linenum { color: #babdb6; } /* tango: aluminium 3 */ -.listing_code .programlisting .normal { color: #000000; } -.listing_code .programlisting .number { color: #75507b; } /* tango: plum 2 */ -.listing_code .programlisting .preproc { color: #204a87; } /* tango: sky blue 3 */ -.listing_code .programlisting .string { color: #c17d11; } /* tango: chocolate 2 */ -.listing_code .programlisting .type { color: #000000; } -.listing_code .programlisting .type a { color: #11326b; } /* tango: sky blue 4 */ -.listing_code .programlisting .symbol { color: #ce5c00; } /* tango: orange 3 */ - -.listing_frame { - /* tango:sky blue 1 */ - border: solid 1px #729fcf; - padding: 0px; -} - -.listing_lines, .listing_code { - margin-top: 0px; - margin-bottom: 0px; - padding: 0.5em; -} -.listing_lines { - /* tango:sky blue 0.5 */ - background: #a6c5e3; - /* tango:aluminium 6 */ - color: #2e3436; -} -.listing_code { - /* tango:sky blue 0 */ - background: #e6f3ff; -} -.listing_code .programlisting { - /* override from previous */ - border: none 0px; - padding: 0px; -} -.listing_lines pre, .listing_code pre { - margin: 0px; -} - diff -Nru totem-2.30.0git20100413/docs/reference/html/TotemCellRendererVideo.html totem-2.30.1/docs/reference/html/TotemCellRendererVideo.html diff -Nru totem-2.30.0git20100413/docs/reference/html/totem.devhelp totem-2.30.1/docs/reference/html/totem.devhelp --- totem-2.30.0git20100413/docs/reference/html/totem.devhelp 2010-04-14 12:16:32.000000000 +0200 +++ totem-2.30.1/docs/reference/html/totem.devhelp 2010-04-27 11:38:11.000000000 +0200 @@ -19,15 +19,15 @@ - - - + + + - + @@ -98,10 +98,10 @@ - - - - + + + + diff -Nru totem-2.30.0git20100413/docs/reference/html/totem.devhelp2 totem-2.30.1/docs/reference/html/totem.devhelp2 --- totem-2.30.0git20100413/docs/reference/html/totem.devhelp2 2010-04-14 12:16:32.000000000 +0200 +++ totem-2.30.1/docs/reference/html/totem.devhelp2 2010-04-27 11:38:11.000000000 +0200 @@ -19,15 +19,15 @@ - - - + + + - + @@ -98,10 +98,10 @@ - - - - + + + + @@ -219,120 +219,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- totem-2.30.0git20100413/docs/reference/version.xml 2010-04-14 12:11:04.000000000 +0200 +++ totem-2.30.1/docs/reference/version.xml 2010-04-27 11:25:21.000000000 +0200 @@ -1 +1 @@ -2.30.0 +2.30.1 diff -Nru totem-2.30.0git20100413/gnome-doc-utils.make totem-2.30.1/gnome-doc-utils.make --- totem-2.30.0git20100413/gnome-doc-utils.make 2010-04-14 12:10:46.000000000 +0200 +++ totem-2.30.1/gnome-doc-utils.make 2010-04-12 19:27:44.000000000 +0200 @@ -266,13 +266,6 @@ .PHONY: po po: $(_DOC_POFILES) -## @ _DOC_MOFILES -## The .mo files used for translating the document -_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) - -.PHONY: mo -mo: $(_DOC_MOFILES) - ## @ _DOC_LC_MODULES ## The top-level documentation files in all other locales _DOC_LC_MODULES = $(if $(DOC_MODULE), \ @@ -339,23 +332,16 @@ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ fi -$(_DOC_MOFILES): %.mo: %.po - @if ! test -d $(dir $@); then \ - echo "mkdir $(dir $@)"; \ - mkdir "$(dir $@)"; \ - fi - msgfmt -o $@ $< - # FIXME: fix the dependancy # FIXME: hook xml2po up -$(_DOC_LC_DOCS) : $(_DOC_MOFILES) +$(_DOC_LC_DOCS) : $(_DOC_POFILES) $(_DOC_LC_DOCS) : $(_DOC_C_DOCS) if ! test -d $(dir $@); then mkdir $(dir $@); fi if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ - mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ - if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ + po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \ + if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \ (cd $(dir $@) && \ - $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ + $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) @@ -400,14 +386,12 @@ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) clean-doc-lc: rm -f $(_DOC_LC_DOCS) - rm -f $(_DOC_MOFILES) @list='$(_DOC_POFILES)'; for po in $$list; do \ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ echo "rm -f $$po"; \ rm -f "$$po"; \ fi; \ done -# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x @for lc in C $(_DOC_REAL_LINGUAS); do \ if test -f "$$lc/.xml2po.mo"; then \ echo "rm -f $$lc/.xml2po.mo"; \ diff -Nru totem-2.30.0git20100413/gtk-doc.make totem-2.30.1/gtk-doc.make --- totem-2.30.0git20100413/gtk-doc.make 2010-04-14 12:10:46.000000000 +0200 +++ totem-2.30.1/gtk-doc.make 2010-04-12 19:27:44.000000000 +0200 @@ -5,13 +5,13 @@ #################################### if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) GTKDOC_RUN = $(LIBTOOL) --mode=execute else GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -GTKDOC_RUN = +GTKDOC_RUN = sh -c endif # We set GPATH here; this gives us semantics for GNU make @@ -31,9 +31,7 @@ $(DOC_MODULE)-overrides.txt DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - pdf-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \ - $(srcdir)/pdf.stamp + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp SCANOBJ_FILES = \ $(DOC_MODULE).args \ @@ -50,23 +48,12 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) if ENABLE_GTK_DOC -if GTK_DOC_BUILD_HTML -HTML_BUILD_STAMP=html-build.stamp -else -HTML_BUILD_STAMP= -endif -if GTK_DOC_BUILD_PDF -PDF_BUILD_STAMP=pdf-build.stamp -else -PDF_BUILD_STAMP= -endif - -all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +all-local: html-build.stamp else all-local: endif -docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP) +docs: html-build.stamp $(REPORT_FILES): sgml-build.stamp @@ -75,9 +62,9 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) @echo 'gtk-doc: Scanning header files' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && \ + cd $(srcdir) && \ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ else \ cd $(srcdir) ; \ @@ -85,7 +72,7 @@ test -f $$i || touch $$i ; \ done \ fi - @touch scan-build.stamp + touch scan-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp @true @@ -95,23 +82,24 @@ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @echo 'gtk-doc: Rebuilding template files' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - @touch tmpl-build.stamp + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) + touch tmpl-build.stamp tmpl.stamp: tmpl-build.stamp @true -$(srcdir)/tmpl/*.sgml: +tmpl/*.sgml: @true + #### xml #### -sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) +sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) @echo 'gtk-doc: Building XML' @-chmod -R u+w $(srcdir) - @cd $(srcdir) && \ + cd $(srcdir) && \ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - @touch sgml-build.stamp + touch sgml-build.stamp sgml.stamp: sgml-build.stamp @true @@ -121,37 +109,18 @@ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo 'gtk-doc: Building HTML' @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/html - @mkdir $(srcdir)/html - @mkhtml_options=""; \ + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + mkhtml_options=""; \ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \ if test "$(?)" = "0"; then \ mkhtml_options=--path="$(srcdir)"; \ - fi; \ - cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + fi + cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) @echo 'gtk-doc: Fixing cross-references' - @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - @touch html-build.stamp - -#### pdf #### - -pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building PDF' - @-chmod -R u+w $(srcdir) - @rm -rf $(srcdir)/$(DOC_MODULE).pdf - @mkpdf_imgdirs=""; \ - if test "x$(HTML_IMAGES)" != "x"; then \ - for img in $(HTML_IMAGES); do \ - part=`dirname $$img`; \ - echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \ - if test $$? != 0; then \ - mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \ - fi; \ - done; \ - fi; \ - cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS) - @touch pdf-build.stamp + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp ############## @@ -161,14 +130,14 @@ distclean-local: cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \ + rm -rf xml $(REPORT_FILES) \ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt maintainer-clean-local: clean cd $(srcdir) && rm -rf xml html install-data-local: - @installfiles=`echo $(srcdir)/html/*`; \ + installfiles=`echo $(srcdir)/html/*`; \ if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ @@ -188,11 +157,12 @@ mv -f $${installdir}/$(DOC_MODULE).devhelp \ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \ fi; \ - $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \ + ! which gtkdoc-rebase >/dev/null 2>&1 || \ + gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \ fi uninstall-local: - @if test -n "$(DOC_MODULE_VERSION)"; then \ + if test -n "$(DOC_MODULE_VERSION)"; then \ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \ else \ installdir="$(DESTDIR)$(TARGET_DIR)"; \ @@ -212,13 +182,15 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/tmpl + mkdir $(distdir)/xml mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ cd $(distdir) && rm -f $(DISTCLEANFILES) - $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html + ! which gtkdoc-rebase >/dev/null 2>&1 || \ + gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs diff -Nru totem-2.30.0git20100413/help/bg/bg.po totem-2.30.1/help/bg/bg.po diff -Nru totem-2.30.0git20100413/help/Makefile.in totem-2.30.1/help/Makefile.in diff -Nru totem-2.30.0git20100413/INSTALL totem-2.30.1/INSTALL --- totem-2.30.0git20100413/NEWS 2010-04-14 12:09:25.000000000 +0200 +++ totem-2.30.1/NEWS 2010-04-27 11:24:03.000000000 +0200 @@ -1,5 +1,25 @@ New features and significant updates in version... +2.30.1: +* Movie Player: + - Fix artifacts and flashing or black screen when paused + - Better download buffering handling + - Fix crasher when PyGTK is badly installed + - Avoid problems with seeking when pausing the video too early + - Fix link to Totem website in error messages + - Disable seeking in DVD menus + - Make Eject menu item work for DVDs + - Fix playback from FTP sites + +* Plugins: + - Port Tracker plugin to Tracker 0.8 + - Make YouTube plugin work again for latest site changes + +* Browser Plugin: + - Add download buffering support even when streaming from + the browser itself + - Fix playback on the Apple trailers site, and add seeking support + 2.30.0: * Updated translations diff -Nru totem-2.30.0git20100413/po/bn_IN.po totem-2.30.1/po/bn_IN.po diff -Nru totem-2.30.0git20100413/po/ca@valencia.po totem-2.30.1/po/ca@valencia.po diff -Nru totem-2.30.0git20100413/po/da.po totem-2.30.1/po/da.po diff -Nru totem-2.30.0git20100413/po/kn.po totem-2.30.1/po/kn.po diff -Nru totem-2.30.0git20100413/src/backend/bacon-video-widget-gst-0.10.c totem-2.30.1/src/backend/bacon-video-widget-gst-0.10.c --- totem-2.30.0git20100413/src/backend/bacon-video-widget-gst-0.10.c 2010-04-14 12:09:25.000000000 +0200 +++ totem-2.30.1/src/backend/bacon-video-widget-gst-0.10.c 2010-04-27 11:17:32.000000000 +0200 @@ -1282,7 +1282,7 @@ BaconVideoWidgetPrivate *priv; gtk_widget_set_can_focus (GTK_WIDGET (bvw), TRUE); - gtk_widget_set_double_buffered (GTK_WIDGET (bvw), TRUE); + gtk_widget_set_double_buffered (GTK_WIDGET (bvw), FALSE); bvw->priv = priv = G_TYPE_INSTANCE_GET_PRIVATE (bvw, BACON_TYPE_VIDEO_WIDGET, BaconVideoWidgetPrivate); @@ -1945,16 +1945,26 @@ bvw_buffering_done (BaconVideoWidget *bvw) { /* When we set buffering left to 0, that means it's ready to play */ - if (bvw->priv->buffering_left == 0) + if (bvw->priv->buffering_left == 0) { + GST_DEBUG ("Buffering left is 0, so buffering done"); return TRUE; + } if (bvw->priv->stream_length <= 0) return FALSE; /* When queue2 doesn't implement buffering-left, always think * it's ready to go */ - if (bvw->priv->buffering_left < 0) + if (bvw->priv->buffering_left < 0) { + GST_DEBUG ("Buffering left not implemented, so buffering done"); return TRUE; + } - return (bvw->priv->buffering_left * 1.1 < bvw->priv->stream_length); + if (bvw->priv->buffering_left * 1.1 < bvw->priv->stream_length) { + GST_DEBUG ("Buffering left: %lld * 1.1 = %lld < %lld", + bvw->priv->buffering_left, bvw->priv->buffering_left * 1.1, + bvw->priv->stream_length); + return TRUE; + } + return FALSE; } static void @@ -2442,8 +2452,9 @@ gst_query_parse_buffering_percent (query, &busy, &percent); gst_query_parse_buffering_range (query, &format, &start, &stop, NULL); - GST_DEBUG ("start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT, - start, stop); + GST_DEBUG ("start %" G_GINT64_FORMAT ", stop %" G_GINT64_FORMAT + ", buffering left %" G_GINT64_FORMAT ", percent %d%%", + start, stop, bvw->priv->buffering_left, percent); if (stop != -1) fill = (gdouble) stop / GST_FORMAT_PERCENT_MAX; diff -Nru totem-2.30.0git20100413/src/backend/Makefile.in totem-2.30.1/src/backend/Makefile.in diff -Nru totem-2.30.0git20100413/src/Makefile.in totem-2.30.1/src/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/bemused/Makefile.in totem-2.30.1/src/plugins/bemused/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/brasero-disc-recorder/Makefile.in totem-2.30.1/src/plugins/brasero-disc-recorder/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/coherence_upnp/Makefile.in totem-2.30.1/src/plugins/coherence_upnp/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/dbus-service/Makefile.in totem-2.30.1/src/plugins/dbus-service/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/galago/Makefile.in totem-2.30.1/src/plugins/galago/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/gromit/Makefile.in totem-2.30.1/src/plugins/gromit/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/iplayer/Makefile.in totem-2.30.1/src/plugins/iplayer/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/jamendo/Makefile.in totem-2.30.1/src/plugins/jamendo/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/lirc/Makefile.in totem-2.30.1/src/plugins/lirc/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/Makefile.in totem-2.30.1/src/plugins/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/media-player-keys/Makefile.in totem-2.30.1/src/plugins/media-player-keys/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/mythtv/Makefile.in totem-2.30.1/src/plugins/mythtv/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/ontop/Makefile.in totem-2.30.1/src/plugins/ontop/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/opensubtitles/Makefile.in totem-2.30.1/src/plugins/opensubtitles/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/properties/Makefile.in totem-2.30.1/src/plugins/properties/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/publish/Makefile.in totem-2.30.1/src/plugins/publish/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/pythonconsole/Makefile.in totem-2.30.1/src/plugins/pythonconsole/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/sample-python/Makefile.in totem-2.30.1/src/plugins/sample-python/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/sample-vala/Makefile.in totem-2.30.1/src/plugins/sample-vala/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/sample-vala/totem-sample-vala-plugin.c totem-2.30.1/src/plugins/sample-vala/totem-sample-vala-plugin.c --- totem-2.30.0git20100413/src/plugins/sample-vala/totem-sample-vala-plugin.c 2010-04-14 12:11:39.000000000 +0200 +++ totem-2.30.1/src/plugins/sample-vala/totem-sample-vala-plugin.c 2009-12-11 16:16:52.000000000 +0100 @@ -48,7 +48,7 @@ static gboolean sample_vala_plugin_real_activate (TotemPlugin* base, TotemObject* totem, GError** error) { SampleValaPlugin * self; - gboolean result = FALSE; + gboolean result; self = (SampleValaPlugin*) base; g_return_val_if_fail (totem != NULL, FALSE); fprintf (stdout, "Hello world\n"); @@ -101,7 +101,7 @@ GType register_totem_plugin (GTypeModule* module) { - GType result = 0UL; + GType result; g_return_val_if_fail (module != NULL, 0UL); sample_vala_plugin_register_type (module); fprintf (stdout, "Registering plugin %s\n", "SampleValaPlugin"); diff -Nru totem-2.30.0git20100413/src/plugins/screensaver/Makefile.in totem-2.30.1/src/plugins/screensaver/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/screenshot/Makefile.in totem-2.30.1/src/plugins/screenshot/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/sidebar-test/Makefile.in totem-2.30.1/src/plugins/sidebar-test/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/skipto/Makefile.in totem-2.30.1/src/plugins/skipto/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/thumbnail/Makefile.in totem-2.30.1/src/plugins/thumbnail/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/totem/Makefile.in totem-2.30.1/src/plugins/totem/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/totem-python-module.c totem-2.30.1/src/plugins/totem-python-module.c --- totem-2.30.0git20100413/src/plugins/totem-python-module.c 2009-12-09 00:42:51.000000000 +0100 +++ totem-2.30.1/src/plugins/totem-python-module.c 2010-04-14 14:41:26.000000000 +0200 @@ -64,6 +64,10 @@ PROP_MODULE }; +/* indicates whether all initializations in + * totem_python_module_init_python were successful */ +gboolean python_initialized = FALSE; + #ifndef PYGOBJECT_CAN_MARSHAL_GVALUE static PyObject * pyg_value_g_value_as_pyobject (const GValue *value) @@ -150,7 +154,7 @@ /* pygtk.require("2.8") */ pygtk = PyImport_ImportModule ("pygtk"); if (pygtk == NULL) { - g_warning ("Could not import pygtk"); + g_warning ("Could not import pygtk, check your installation"); PyErr_Print(); return; } @@ -186,7 +190,7 @@ pygtk_version = PyDict_GetItemString (mdict, "pygtk_version"); pygtk_required_version = Py_BuildValue ("(iii)", 2, 12, 0); if (PyObject_Compare (pygtk_version, pygtk_required_version) == -1) { - g_warning("PyGTK %s required, but %s found.", + g_warning("PyGTK %s required, but %s found, check your installation.", PyString_AsString (PyObject_Repr (pygtk_required_version)), PyString_AsString (PyObject_Repr (pygtk_version))); Py_DECREF (pygtk_required_version); @@ -212,7 +216,7 @@ totem = PyImport_ImportModule ("totem"); if (totem == NULL) { - g_warning ("Could not import Python module 'totem'"); + g_warning ("Could not import Python module 'totem', check your installation"); PyErr_Print (); return; } @@ -264,6 +268,10 @@ * restore the state in a class_finalize or so, but since totem doesn't * do any clean-up at this point, we'll just skip this as well */ PyEval_SaveThread(); + + /* Python and the supporting libraries were initialised + * successfully */ + python_initialized = TRUE; } static gboolean @@ -277,6 +285,8 @@ gboolean res = FALSE; g_return_val_if_fail (Py_IsInitialized (), FALSE); + if (python_initialized == FALSE) + return FALSE; state = pyg_gil_state_ensure(); diff -Nru totem-2.30.0git20100413/src/plugins/tracker/Makefile.in totem-2.30.1/src/plugins/tracker/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/youtube/Makefile.in totem-2.30.1/src/plugins/youtube/Makefile.in diff -Nru totem-2.30.0git20100413/src/plugins/youtube/totem-youtube.c totem-2.30.1/src/plugins/youtube/totem-youtube.c --- totem-2.30.0git20100413/src/plugins/youtube/totem-youtube.c 2010-04-14 12:09:25.000000000 +0200 +++ totem-2.30.1/src/plugins/youtube/totem-youtube.c 2010-04-27 11:17:33.000000000 +0200 @@ -860,6 +860,12 @@ /* Set up the GData service (needed for the tree views' queries) */ self->service = gdata_youtube_service_new (DEVELOPER_KEY, CLIENT_ID); + /* Set up network timeouts, if they're supported by our version of libgdata. + * This will return from queries with %GDATA_SERVICE_ERROR_NETWORK_ERROR if network operations take longer than 30 seconds. */ +#ifdef HAVE_LIBGDATA_0_7 + gdata_service_set_timeout (GDATA_SERVICE (self->service), 30); +#endif /* HAVE_LIBGDATA_0_7 */ + /* Set up the queries */ self->query[SEARCH_TREE_VIEW] = gdata_query_new_with_limits (NULL, 0, MAX_RESULTS); self->query[RELATED_TREE_VIEW] = gdata_query_new_with_limits (NULL, 0, MAX_RESULTS); diff -Nru totem-2.30.0git20100413/totem.spec totem-2.30.1/totem.spec --- totem-2.30.0git20100413/totem.spec 2010-04-14 12:11:03.000000000 +0200 +++ totem-2.30.1/totem.spec 2010-04-27 11:25:18.000000000 +0200 @@ -4,7 +4,7 @@ Summary: Movie player for GNOME 2 Name: totem -Version: 2.30.0 +Version: 2.30.1 Release: 1 License: GPL Group: Applications/Multimedia