r23832 - in /desktop/experimental/totem/debian: changelog patches/70_bbc_plugin.patch patches/90_autotools.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Apr 16 00:33:34 UTC 2010
Author: biebl
Date: Fri Apr 16 00:33:34 2010
New Revision: 23832
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23832
Log:
Refresh patches to apply cleanly.
Modified:
desktop/experimental/totem/debian/changelog
desktop/experimental/totem/debian/patches/70_bbc_plugin.patch
desktop/experimental/totem/debian/patches/90_autotools.patch
Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=23832&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog [utf-8] (original)
+++ desktop/experimental/totem/debian/changelog [utf-8] Fri Apr 16 00:33:34 2010
@@ -3,6 +3,7 @@
* debian/patches/03_tracker_0.8.patch
- Add support for tracker 0.8. Closes: #577207
Patch cherry-picked from upstream Git.
+ * Refresh patches to apply cleanly.
-- Michael Biebl <biebl at debian.org> Fri, 16 Apr 2010 02:26:02 +0200
Modified: desktop/experimental/totem/debian/patches/70_bbc_plugin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/70_bbc_plugin.patch?rev=23832&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/70_bbc_plugin.patch [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/70_bbc_plugin.patch [utf-8] Fri Apr 16 00:33:34 2010
@@ -1,6 +1,8 @@
+Index: b/bindings/python/totem.defs
+===================================================================
--- a/bindings/python/totem.defs
+++ b/bindings/python/totem.defs
-@@ -206,6 +206,16 @@
+@@ -216,6 +216,16 @@
(return-type "none")
)
@@ -17,6 +19,8 @@
(define-method action_stop
(of-object "TotemObject")
(c-name "totem_action_stop")
+Index: b/configure.in
+===================================================================
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,7 @@
@@ -28,7 +32,7 @@
PLUGINDIR='${libdir}/totem/plugins'
AC_SUBST(PLUGINDIR)
-@@ -513,6 +513,32 @@
+@@ -512,6 +512,32 @@
add_plugin="0"
fi
;;
@@ -61,7 +65,7 @@
bemused)
PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
if test "${HAVE_BLUEZ}" != "yes" ; then
-@@ -818,6 +844,7 @@
+@@ -814,6 +840,7 @@
lib/Makefile
src/Makefile
src/plugins/Makefile
@@ -69,6 +73,8 @@
src/plugins/bemused/Makefile
src/plugins/coherence_upnp/Makefile
src/plugins/dbus-service/Makefile
+Index: b/src/plugins/bbc/Makefile.am
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/Makefile.am
@@ -0,0 +1,26 @@
@@ -98,6 +104,8 @@
+ echo
+
+
+Index: b/src/plugins/bbc/bbc.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/bbc.py
@@ -0,0 +1,95 @@
@@ -196,6 +204,8 @@
+ else:
+ gst.error('No uri for episode ' + episode.title)
+
+Index: b/src/plugins/bbc/bbc.totem-plugin.in
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/bbc.totem-plugin.in
@@ -0,0 +1,9 @@
@@ -208,6 +218,8 @@
+Authors=Tim-Philipp Müller <tim.muller at collabora.co.uk>
+Copyright=Copyright © 2008 Tim-Philipp Müller and Canonical Ltd.
+Website=http://www.gnome.org/projects/totem/
+Index: b/src/plugins/bbc/contentview.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/contentview.py
@@ -0,0 +1,1019 @@
@@ -1230,6 +1242,8 @@
+ window.show_all()
+ gtk.main()
+
+Index: b/src/plugins/bbc/genres.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/genres.py
@@ -0,0 +1,251 @@
@@ -1484,6 +1498,8 @@
+if __name__ == "__main__":
+ pass
+
+Index: b/src/plugins/bbc/installablecodecs.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/installablecodecs.py
@@ -0,0 +1,112 @@
Modified: desktop/experimental/totem/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/90_autotools.patch?rev=23832&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] Fri Apr 16 00:33:34 2010
@@ -1,6 +1,29 @@
-diff -Naur totem-2.30.0.old/aclocal.m4 totem-2.30.0/aclocal.m4
---- totem-2.30.0.old/aclocal.m4 2010-03-29 18:13:20.000000000 +0200
-+++ totem-2.30.0/aclocal.m4 2010-03-31 13:33:37.352484831 +0200
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -124,6 +124,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BBC_CFLAGS = @BBC_CFLAGS@
++BBC_LIBS = @BBC_LIBS@
+ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
+ BEMUSED_LIBS = @BEMUSED_LIBS@
+ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+@@ -180,6 +182,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+Index: b/aclocal.m4
+===================================================================
+--- a/aclocal.m4
++++ b/aclocal.m4
@@ -757,6 +757,12 @@
[
AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -251,9 +274,10 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -Naur totem-2.30.0.old/bindings/Makefile.in totem-2.30.0/bindings/Makefile.in
---- totem-2.30.0.old/bindings/Makefile.in 2010-03-29 18:22:31.000000000 +0200
-+++ totem-2.30.0/bindings/Makefile.in 2010-03-31 13:33:39.836479796 +0200
+Index: b/bindings/Makefile.in
+===================================================================
+--- a/bindings/Makefile.in
++++ b/bindings/Makefile.in
@@ -109,6 +109,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -272,9 +296,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/bindings/python/Makefile.in totem-2.30.0/bindings/python/Makefile.in
---- totem-2.30.0.old/bindings/python/Makefile.in 2010-03-29 18:22:32.000000000 +0200
-+++ totem-2.30.0/bindings/python/Makefile.in 2010-03-31 13:33:39.940482459 +0200
+Index: b/bindings/python/Makefile.in
+===================================================================
+--- a/bindings/python/Makefile.in
++++ b/bindings/python/Makefile.in
@@ -106,6 +106,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -293,9 +318,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/bindings/vala/Makefile.in totem-2.30.0/bindings/vala/Makefile.in
---- totem-2.30.0.old/bindings/vala/Makefile.in 2010-03-29 18:22:32.000000000 +0200
-+++ totem-2.30.0/bindings/vala/Makefile.in 2010-03-31 13:33:40.012480297 +0200
+Index: b/bindings/vala/Makefile.in
+===================================================================
+--- a/bindings/vala/Makefile.in
++++ b/bindings/vala/Makefile.in
@@ -70,6 +70,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -314,9 +340,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/browser-plugin/Makefile.in totem-2.30.0/browser-plugin/Makefile.in
---- totem-2.30.0.old/browser-plugin/Makefile.in 2010-03-29 18:22:32.000000000 +0200
-+++ totem-2.30.0/browser-plugin/Makefile.in 2010-03-31 13:33:40.404481657 +0200
+Index: b/browser-plugin/Makefile.in
+===================================================================
+--- a/browser-plugin/Makefile.in
++++ b/browser-plugin/Makefile.in
@@ -304,6 +304,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -335,9 +362,99 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/configure totem-2.30.0/configure
---- totem-2.30.0.old/configure 2010-03-29 18:13:34.000000000 +0200
-+++ totem-2.30.0/configure 2010-03-31 13:33:38.840480024 +0200
+Index: b/config.guess
+===================================================================
+--- a/config.guess
++++ b/config.guess
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2009-12-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,9 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+Index: b/config.sub
+===================================================================
+--- a/config.sub
++++ b/config.sub
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-11-20'
++timestamp='2010-01-22'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -75,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -380,7 +381,8 @@
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
+ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+@@ -1085,6 +1087,11 @@
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1435,6 +1442,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
@@ -753,12 +753,20 @@
AM_CFLAGS
AM_CPPFLAGS
@@ -1869,7 +1986,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBEPC_PKG_ERRORS" >&5
-@@ -20543,10 +20745,11 @@
+@@ -20543,37 +20745,41 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
$as_echo_n "checking for TRACKER... " >&6; }
@@ -1877,15 +1994,20 @@
- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_CFLAGS"; then
+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= 0.8.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.1") 2>&5
ac_status=$?
-@@ -20556,13 +20759,15 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.7 >= 0.7.1" 2>/dev/null`
++ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= 0.8.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -1899,15 +2021,20 @@
- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_LIBS"; then
+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= 0.8.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.1") 2>&5
ac_status=$?
-@@ -20572,8 +20777,9 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.7 >= 0.7.1" 2>/dev/null`
++ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= 0.8.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -1924,14 +2051,109 @@
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.7 >= 0.7.1" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.7 >= 0.7.1"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= 0.8.1"`
else
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.7 >= 0.7.1" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.7 >= 0.7.1"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= 0.8.1"`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_PKG_ERRORS" >&5
-@@ -20622,10 +20828,11 @@
+@@ -20606,13 +20812,87 @@
+ HAVE_TRACKER=yes
+ fi
+ if test "${HAVE_TRACKER}" != "yes" ; then
+- plugin_error_or_ignore "you need the tracker development headers installed for the tracker plugin"
+- add_plugin="0"
+- fi
+- ;;
+- sample-vala)
+- if test "${with_vala}" != "yes" ; then
+- plugin_error_or_ignore "you need vala installed to use the sample-vala plugin"
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
++$as_echo_n "checking for TRACKER... " >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TRACKER_CFLAGS"; then
++ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.9 >= 0.9.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.9 >= 0.9.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.9 >= 0.9.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TRACKER_LIBS"; then
++ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.9 >= 0.9.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.9 >= 0.9.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.9 >= 0.9.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"`
++ else
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$TRACKER_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ HAVE_TRACKER=no
++elif test $pkg_failed = untried; then
++ HAVE_TRACKER=no
++else
++ TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
++ TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ HAVE_TRACKER=yes
++fi
++ fi
++
++ if test "${HAVE_TRACKER}" != "yes" ; then
++ plugin_error_or_ignore "you need the tracker development headers installed for the tracker plugin"
++ add_plugin="0"
++ fi
++ ;;
++ sample-vala)
++ if test "${with_vala}" != "yes" ; then
++ plugin_error_or_ignore "you need vala installed to use the sample-vala plugin"
+ add_plugin="0"
+ fi
+ ;;
+@@ -20622,10 +20902,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
$as_echo_n "checking for GLIB... " >&6; }
@@ -1947,7 +2169,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5
ac_status=$?
-@@ -20635,13 +20842,15 @@
+@@ -20635,13 +20916,15 @@
else
pkg_failed=yes
fi
@@ -1969,7 +2191,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.15.0\""; } >&5
($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.15.0") 2>&5
ac_status=$?
-@@ -20651,8 +20860,9 @@
+@@ -20651,8 +20934,9 @@
else
pkg_failed=yes
fi
@@ -1981,7 +2203,7 @@
fi
-@@ -20665,9 +20875,9 @@
+@@ -20665,9 +20949,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1993,7 +2215,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
-@@ -20695,10 +20905,11 @@
+@@ -20695,10 +20979,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DISC_RECORDER" >&5
$as_echo_n "checking for DISC_RECORDER... " >&6; }
@@ -2009,7 +2231,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5
ac_status=$?
-@@ -20708,13 +20919,15 @@
+@@ -20708,13 +20993,15 @@
else
pkg_failed=yes
fi
@@ -2031,7 +2253,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.6.0 gtk+-x11-2.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.6.0 gtk+-x11-2.0") 2>&5
ac_status=$?
-@@ -20724,8 +20937,9 @@
+@@ -20724,8 +21011,9 @@
else
pkg_failed=yes
fi
@@ -2043,7 +2265,7 @@
fi
-@@ -20738,9 +20952,9 @@
+@@ -20738,9 +21026,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2055,7 +2277,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$DISC_RECORDER_PKG_ERRORS" >&5
-@@ -20768,10 +20982,11 @@
+@@ -20768,10 +21056,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA" >&5
$as_echo_n "checking for LIBGDATA... " >&6; }
@@ -2071,7 +2293,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5
ac_status=$?
-@@ -20781,13 +20996,15 @@
+@@ -20781,13 +21070,15 @@
else
pkg_failed=yes
fi
@@ -2093,7 +2315,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.4.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libgdata >= 0.4.0") 2>&5
ac_status=$?
-@@ -20797,8 +21014,9 @@
+@@ -20797,8 +21088,9 @@
else
pkg_failed=yes
fi
@@ -2105,7 +2327,7 @@
fi
-@@ -20811,9 +21029,9 @@
+@@ -20811,9 +21103,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2117,7 +2339,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBGDATA_PKG_ERRORS" >&5
-@@ -20898,10 +21116,11 @@
+@@ -20898,10 +21190,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BROWSER_PLUGIN" >&5
$as_echo_n "checking for BROWSER_PLUGIN... " >&6; }
@@ -2133,7 +2355,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
gio-2.0
x11
-@@ -20920,13 +21139,15 @@
+@@ -20920,13 +21213,15 @@
else
pkg_failed=yes
fi
@@ -2155,7 +2377,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
gio-2.0
x11
-@@ -20945,8 +21166,9 @@
+@@ -20945,8 +21240,9 @@
else
pkg_failed=yes
fi
@@ -2167,7 +2389,7 @@
fi
-@@ -20959,15 +21181,15 @@
+@@ -20959,15 +21255,15 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2187,7 +2409,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5
-@@ -21007,10 +21229,11 @@
+@@ -21007,10 +21303,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
@@ -2203,7 +2425,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
ac_status=$?
-@@ -21020,13 +21243,15 @@
+@@ -21020,13 +21317,15 @@
else
pkg_failed=yes
fi
@@ -2225,7 +2447,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
ac_status=$?
-@@ -21036,8 +21261,9 @@
+@@ -21036,8 +21335,9 @@
else
pkg_failed=yes
fi
@@ -2237,7 +2459,7 @@
fi
-@@ -21050,9 +21276,9 @@
+@@ -21050,9 +21350,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2249,7 +2471,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
-@@ -21279,10 +21505,11 @@
+@@ -21279,10 +21579,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
$as_echo_n "checking for NAUTILUS... " >&6; }
@@ -2265,7 +2487,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5
ac_status=$?
-@@ -21292,13 +21519,15 @@
+@@ -21292,13 +21593,15 @@
else
pkg_failed=yes
fi
@@ -2287,7 +2509,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0 libnautilus-extension\""; } >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0 libnautilus-extension") 2>&5
ac_status=$?
-@@ -21308,8 +21537,9 @@
+@@ -21308,8 +21611,9 @@
else
pkg_failed=yes
fi
@@ -2299,7 +2521,7 @@
fi
-@@ -21322,9 +21552,9 @@
+@@ -21322,9 +21626,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2311,7 +2533,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$NAUTILUS_PKG_ERRORS" >&5
-@@ -21392,10 +21622,11 @@
+@@ -21392,10 +21696,11 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
@@ -2327,7 +2549,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
ac_status=$?
-@@ -21405,13 +21636,15 @@
+@@ -21405,13 +21710,15 @@
else
pkg_failed=yes
fi
@@ -2349,7 +2571,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= \$DBUS_REQS\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= $DBUS_REQS") 2>&5
ac_status=$?
-@@ -21421,8 +21654,9 @@
+@@ -21421,8 +21728,9 @@
else
pkg_failed=yes
fi
@@ -2361,7 +2583,7 @@
fi
-@@ -21435,9 +21669,9 @@
+@@ -21435,9 +21743,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -2373,7 +2595,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
-@@ -21771,54 +22005,58 @@
+@@ -21771,54 +22079,58 @@
@@ -2465,7 +2687,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -21828,7 +22066,7 @@
+@@ -21828,7 +22140,7 @@
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -2474,7 +2696,7 @@
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -21839,18 +22077,116 @@
+@@ -21839,18 +22151,116 @@
;;
esac
fi
@@ -2596,7 +2818,7 @@
if test x$enable_gtk_doc = xyes; then
-@@ -21861,6 +22197,22 @@
+@@ -21861,6 +22271,22 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -2619,7 +2841,7 @@
if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -21869,6 +22221,14 @@
+@@ -21869,6 +22295,14 @@
GTK_DOC_USE_LIBTOOL_FALSE=
fi
@@ -2634,7 +2856,7 @@
# This macro expands DIR and assigns it to RET.
-@@ -21917,7 +22277,7 @@
+@@ -21917,7 +22351,7 @@
@@ -2643,7 +2865,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -22120,10 +22480,22 @@
+@@ -22120,10 +22554,22 @@
as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -2666,7 +2888,7 @@
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
-@@ -23083,6 +23455,7 @@
+@@ -23083,6 +23529,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" ;;
@@ -2674,9 +2896,32 @@
"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 -Naur totem-2.30.0.old/data/icons/16x16/Makefile.in totem-2.30.0/data/icons/16x16/Makefile.in
---- totem-2.30.0.old/data/icons/16x16/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/16x16/Makefile.in 2010-03-31 13:33:40.617480516 +0200
+Index: b/data/Makefile.in
+===================================================================
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -141,6 +141,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BBC_CFLAGS = @BBC_CFLAGS@
++BBC_LIBS = @BBC_LIBS@
+ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
+ BEMUSED_LIBS = @BEMUSED_LIBS@
+ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+@@ -197,6 +199,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+Index: b/data/icons/16x16/Makefile.in
+===================================================================
+--- a/data/icons/16x16/Makefile.in
++++ b/data/icons/16x16/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2695,9 +2940,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/icons/22x22/Makefile.in totem-2.30.0/data/icons/22x22/Makefile.in
---- totem-2.30.0.old/data/icons/22x22/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/22x22/Makefile.in 2010-03-31 13:33:40.693480127 +0200
+Index: b/data/icons/22x22/Makefile.in
+===================================================================
+--- a/data/icons/22x22/Makefile.in
++++ b/data/icons/22x22/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2716,9 +2962,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/icons/24x24/Makefile.in totem-2.30.0/data/icons/24x24/Makefile.in
---- totem-2.30.0.old/data/icons/24x24/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/24x24/Makefile.in 2010-03-31 13:33:40.765480341 +0200
+Index: b/data/icons/24x24/Makefile.in
+===================================================================
+--- a/data/icons/24x24/Makefile.in
++++ b/data/icons/24x24/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2737,9 +2984,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/icons/32x32/Makefile.in totem-2.30.0/data/icons/32x32/Makefile.in
---- totem-2.30.0.old/data/icons/32x32/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/32x32/Makefile.in 2010-03-31 13:33:40.841480640 +0200
+Index: b/data/icons/32x32/Makefile.in
+===================================================================
+--- a/data/icons/32x32/Makefile.in
++++ b/data/icons/32x32/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2758,9 +3006,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/icons/48x48/Makefile.in totem-2.30.0/data/icons/48x48/Makefile.in
---- totem-2.30.0.old/data/icons/48x48/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/48x48/Makefile.in 2010-03-31 13:33:40.917480095 +0200
+Index: b/data/icons/48x48/Makefile.in
+===================================================================
+--- a/data/icons/48x48/Makefile.in
++++ b/data/icons/48x48/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2779,9 +3028,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/icons/Makefile.in totem-2.30.0/data/icons/Makefile.in
---- totem-2.30.0.old/data/icons/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/Makefile.in 2010-03-31 13:33:40.993480045 +0200
+Index: b/data/icons/Makefile.in
+===================================================================
+--- a/data/icons/Makefile.in
++++ b/data/icons/Makefile.in
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2800,9 +3050,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/icons/scalable/Makefile.in totem-2.30.0/data/icons/scalable/Makefile.in
---- totem-2.30.0.old/data/icons/scalable/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/data/icons/scalable/Makefile.in 2010-03-31 13:33:41.069480490 +0200
+Index: b/data/icons/scalable/Makefile.in
+===================================================================
+--- a/data/icons/scalable/Makefile.in
++++ b/data/icons/scalable/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2821,30 +3072,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/data/Makefile.in totem-2.30.0/data/Makefile.in
---- totem-2.30.0.old/data/Makefile.in 2010-03-29 18:22:32.000000000 +0200
-+++ totem-2.30.0/data/Makefile.in 2010-03-31 13:33:40.537480473 +0200
-@@ -141,6 +141,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -197,6 +199,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/docs/Makefile.in totem-2.30.0/docs/Makefile.in
---- totem-2.30.0.old/docs/Makefile.in 2010-03-29 18:22:33.000000000 +0200
-+++ totem-2.30.0/docs/Makefile.in 2010-03-31 13:33:41.153480555 +0200
+Index: b/docs/Makefile.in
+===================================================================
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -2863,9 +3094,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/docs/reference/Makefile.in totem-2.30.0/docs/reference/Makefile.in
---- totem-2.30.0.old/docs/reference/Makefile.in 2010-03-29 18:22:34.000000000 +0200
-+++ totem-2.30.0/docs/reference/Makefile.in 2010-03-31 13:33:41.253480002 +0200
+Index: b/docs/reference/Makefile.in
+===================================================================
+--- a/docs/reference/Makefile.in
++++ b/docs/reference/Makefile.in
@@ -76,6 +76,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -3081,9 +3313,71 @@
.PHONY : dist-hook-local docs
-diff -Naur totem-2.30.0.old/gtk-doc.make totem-2.30.0/gtk-doc.make
---- totem-2.30.0.old/gtk-doc.make 2010-03-29 18:22:25.000000000 +0200
-+++ totem-2.30.0/gtk-doc.make 2010-03-31 13:33:34.060482908 +0200
+Index: b/gnome-doc-utils.make
+===================================================================
+--- a/gnome-doc-utils.make
++++ b/gnome-doc-utils.make
+@@ -266,6 +266,13 @@
+ .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), \
+@@ -332,16 +339,23 @@
+ $(_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_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_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; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+
+@@ -386,12 +400,14 @@
+ 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"; \
+Index: b/gtk-doc.make
+===================================================================
+--- a/gtk-doc.make
++++ b/gtk-doc.make
@@ -5,13 +5,13 @@
####################################
@@ -3286,9 +3580,10 @@
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
.PHONY : dist-hook-local docs
-diff -Naur totem-2.30.0.old/help/Makefile.in totem-2.30.0/help/Makefile.in
---- totem-2.30.0.old/help/Makefile.in 2010-03-29 18:22:34.000000000 +0200
-+++ totem-2.30.0/help/Makefile.in 2010-03-31 13:33:41.357480157 +0200
+Index: b/help/Makefile.in
+===================================================================
+--- a/help/Makefile.in
++++ b/help/Makefile.in
@@ -92,6 +92,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -3307,9 +3602,71 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/lib/Makefile.in totem-2.30.0/lib/Makefile.in
---- totem-2.30.0.old/lib/Makefile.in 2010-03-29 18:22:34.000000000 +0200
-+++ totem-2.30.0/lib/Makefile.in 2010-03-31 13:33:41.453479430 +0200
+@@ -386,6 +390,7 @@
+ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
+
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+
+@@ -741,6 +746,9 @@
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ $(_DOC_POFILES):
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+@@ -768,16 +776,23 @@
+ $(_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_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_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; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+ .PHONY: pot
+@@ -803,12 +818,14 @@
+ 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"; \
+Index: b/lib/Makefile.in
+===================================================================
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
@@ -104,6 +104,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -3328,9 +3685,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/ltmain.sh totem-2.30.0/ltmain.sh
---- totem-2.30.0.old/ltmain.sh 2010-03-29 18:22:24.000000000 +0200
-+++ totem-2.30.0/ltmain.sh 2010-03-31 13:33:33.608480420 +0200
+Index: b/ltmain.sh
+===================================================================
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -3409,10 +3767,11 @@
esac
;;
no)
-diff -Naur totem-2.30.0.old/Makefile.in totem-2.30.0/Makefile.in
---- totem-2.30.0.old/Makefile.in 2010-03-29 18:22:40.000000000 +0200
-+++ totem-2.30.0/Makefile.in 2010-03-31 13:33:45.104480051 +0200
-@@ -124,6 +124,8 @@
+Index: b/src/Makefile.in
+===================================================================
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -343,6 +343,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
@@ -3421,7 +3780,7 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -180,6 +182,8 @@
+@@ -399,6 +401,8 @@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -3430,9 +3789,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/backend/Makefile.in totem-2.30.0/src/backend/Makefile.in
---- totem-2.30.0.old/src/backend/Makefile.in 2010-03-29 18:22:35.000000000 +0200
-+++ totem-2.30.0/src/backend/Makefile.in 2010-03-31 13:33:41.921480044 +0200
+Index: b/src/backend/Makefile.in
+===================================================================
+--- a/src/backend/Makefile.in
++++ b/src/backend/Makefile.in
@@ -121,6 +121,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -3451,10 +3811,11 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/Makefile.in totem-2.30.0/src/Makefile.in
---- totem-2.30.0.old/src/Makefile.in 2010-03-29 18:22:35.000000000 +0200
-+++ totem-2.30.0/src/Makefile.in 2010-03-31 13:33:41.761481648 +0200
-@@ -343,6 +343,8 @@
+Index: b/src/plugins/Makefile.in
+===================================================================
+--- a/src/plugins/Makefile.in
++++ b/src/plugins/Makefile.in
+@@ -167,6 +167,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
@@ -3463,7 +3824,7 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -399,6 +401,8 @@
+@@ -223,6 +225,8 @@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -3472,9 +3833,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/bbc/Makefile.in totem-2.30.0/src/plugins/bbc/Makefile.in
---- totem-2.30.0.old/src/plugins/bbc/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ totem-2.30.0/src/plugins/bbc/Makefile.in 2010-03-31 13:33:42.264481052 +0200
+Index: b/src/plugins/bbc/Makefile.in
+===================================================================
+--- /dev/null
++++ b/src/plugins/bbc/Makefile.in
@@ -0,0 +1,596 @@
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
@@ -4072,9 +4434,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 -Naur totem-2.30.0.old/src/plugins/bemused/Makefile.in totem-2.30.0/src/plugins/bemused/Makefile.in
---- totem-2.30.0.old/src/plugins/bemused/Makefile.in 2010-03-29 18:22:35.000000000 +0200
-+++ totem-2.30.0/src/plugins/bemused/Makefile.in 2010-03-31 13:33:42.396479942 +0200
+Index: b/src/plugins/bemused/Makefile.in
+===================================================================
+--- a/src/plugins/bemused/Makefile.in
++++ b/src/plugins/bemused/Makefile.in
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4093,9 +4456,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.30.0/src/plugins/brasero-disc-recorder/Makefile.in
---- totem-2.30.0.old/src/plugins/brasero-disc-recorder/Makefile.in 2010-03-29 18:22:35.000000000 +0200
-+++ totem-2.30.0/src/plugins/brasero-disc-recorder/Makefile.in 2010-03-31 13:33:42.508480906 +0200
+Index: b/src/plugins/brasero-disc-recorder/Makefile.in
+===================================================================
+--- a/src/plugins/brasero-disc-recorder/Makefile.in
++++ b/src/plugins/brasero-disc-recorder/Makefile.in
@@ -128,6 +128,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4114,9 +4478,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/coherence_upnp/Makefile.in totem-2.30.0/src/plugins/coherence_upnp/Makefile.in
---- totem-2.30.0.old/src/plugins/coherence_upnp/Makefile.in 2010-03-29 18:22:36.000000000 +0200
-+++ totem-2.30.0/src/plugins/coherence_upnp/Makefile.in 2010-03-31 13:33:42.588480532 +0200
+Index: b/src/plugins/coherence_upnp/Makefile.in
+===================================================================
+--- a/src/plugins/coherence_upnp/Makefile.in
++++ b/src/plugins/coherence_upnp/Makefile.in
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4135,9 +4500,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/dbus-service/Makefile.in totem-2.30.0/src/plugins/dbus-service/Makefile.in
---- totem-2.30.0.old/src/plugins/dbus-service/Makefile.in 2010-03-29 18:22:36.000000000 +0200
-+++ totem-2.30.0/src/plugins/dbus-service/Makefile.in 2010-03-31 13:33:42.676480409 +0200
+Index: b/src/plugins/dbus-service/Makefile.in
+===================================================================
+--- a/src/plugins/dbus-service/Makefile.in
++++ b/src/plugins/dbus-service/Makefile.in
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4156,9 +4522,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/galago/Makefile.in totem-2.30.0/src/plugins/galago/Makefile.in
---- totem-2.30.0.old/src/plugins/galago/Makefile.in 2010-03-29 18:22:36.000000000 +0200
-+++ totem-2.30.0/src/plugins/galago/Makefile.in 2010-03-31 13:33:42.788479284 +0200
+Index: b/src/plugins/galago/Makefile.in
+===================================================================
+--- a/src/plugins/galago/Makefile.in
++++ b/src/plugins/galago/Makefile.in
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4177,9 +4544,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/gromit/Makefile.in totem-2.30.0/src/plugins/gromit/Makefile.in
---- totem-2.30.0.old/src/plugins/gromit/Makefile.in 2010-03-29 18:22:36.000000000 +0200
-+++ totem-2.30.0/src/plugins/gromit/Makefile.in 2010-03-31 13:33:42.884479397 +0200
+Index: b/src/plugins/gromit/Makefile.in
+===================================================================
+--- a/src/plugins/gromit/Makefile.in
++++ b/src/plugins/gromit/Makefile.in
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4198,9 +4566,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/iplayer/Makefile.in totem-2.30.0/src/plugins/iplayer/Makefile.in
---- totem-2.30.0.old/src/plugins/iplayer/Makefile.in 2010-03-29 18:22:36.000000000 +0200
-+++ totem-2.30.0/src/plugins/iplayer/Makefile.in 2010-03-31 13:33:42.968479172 +0200
+Index: b/src/plugins/iplayer/Makefile.in
+===================================================================
+--- a/src/plugins/iplayer/Makefile.in
++++ b/src/plugins/iplayer/Makefile.in
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4219,9 +4588,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/jamendo/Makefile.in totem-2.30.0/src/plugins/jamendo/Makefile.in
---- totem-2.30.0.old/src/plugins/jamendo/Makefile.in 2010-03-29 18:22:36.000000000 +0200
-+++ totem-2.30.0/src/plugins/jamendo/Makefile.in 2010-03-31 13:33:43.056479536 +0200
+Index: b/src/plugins/jamendo/Makefile.in
+===================================================================
+--- a/src/plugins/jamendo/Makefile.in
++++ b/src/plugins/jamendo/Makefile.in
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4240,9 +4610,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/lirc/Makefile.in totem-2.30.0/src/plugins/lirc/Makefile.in
---- totem-2.30.0.old/src/plugins/lirc/Makefile.in 2010-03-29 18:22:37.000000000 +0200
-+++ totem-2.30.0/src/plugins/lirc/Makefile.in 2010-03-31 13:33:43.164479651 +0200
+Index: b/src/plugins/lirc/Makefile.in
+===================================================================
+--- a/src/plugins/lirc/Makefile.in
++++ b/src/plugins/lirc/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4261,30 +4632,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/Makefile.in totem-2.30.0/src/plugins/Makefile.in
---- totem-2.30.0.old/src/plugins/Makefile.in 2010-03-29 18:22:35.000000000 +0200
-+++ totem-2.30.0/src/plugins/Makefile.in 2010-03-31 13:33:42.092480480 +0200
-@@ -167,6 +167,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -223,6 +225,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/media-player-keys/Makefile.in totem-2.30.0/src/plugins/media-player-keys/Makefile.in
---- totem-2.30.0.old/src/plugins/media-player-keys/Makefile.in 2010-03-29 18:22:37.000000000 +0200
-+++ totem-2.30.0/src/plugins/media-player-keys/Makefile.in 2010-03-31 13:33:43.272479206 +0200
+Index: b/src/plugins/media-player-keys/Makefile.in
+===================================================================
+--- a/src/plugins/media-player-keys/Makefile.in
++++ b/src/plugins/media-player-keys/Makefile.in
@@ -130,6 +130,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4303,9 +4654,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/mythtv/Makefile.in totem-2.30.0/src/plugins/mythtv/Makefile.in
---- totem-2.30.0.old/src/plugins/mythtv/Makefile.in 2010-03-29 18:22:37.000000000 +0200
-+++ totem-2.30.0/src/plugins/mythtv/Makefile.in 2010-03-31 13:33:43.372479549 +0200
+Index: b/src/plugins/mythtv/Makefile.in
+===================================================================
+--- a/src/plugins/mythtv/Makefile.in
++++ b/src/plugins/mythtv/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4324,9 +4676,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/ontop/Makefile.in totem-2.30.0/src/plugins/ontop/Makefile.in
---- totem-2.30.0.old/src/plugins/ontop/Makefile.in 2010-03-29 18:22:37.000000000 +0200
-+++ totem-2.30.0/src/plugins/ontop/Makefile.in 2010-03-31 13:33:43.476479421 +0200
+Index: b/src/plugins/ontop/Makefile.in
+===================================================================
+--- a/src/plugins/ontop/Makefile.in
++++ b/src/plugins/ontop/Makefile.in
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4345,9 +4698,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/opensubtitles/Makefile.in totem-2.30.0/src/plugins/opensubtitles/Makefile.in
---- totem-2.30.0.old/src/plugins/opensubtitles/Makefile.in 2010-03-29 18:22:37.000000000 +0200
-+++ totem-2.30.0/src/plugins/opensubtitles/Makefile.in 2010-03-31 13:33:43.596480990 +0200
+Index: b/src/plugins/opensubtitles/Makefile.in
+===================================================================
+--- a/src/plugins/opensubtitles/Makefile.in
++++ b/src/plugins/opensubtitles/Makefile.in
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4366,9 +4720,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/properties/Makefile.in totem-2.30.0/src/plugins/properties/Makefile.in
---- totem-2.30.0.old/src/plugins/properties/Makefile.in 2010-03-29 18:22:37.000000000 +0200
-+++ totem-2.30.0/src/plugins/properties/Makefile.in 2010-03-31 13:33:43.772479765 +0200
+Index: b/src/plugins/properties/Makefile.in
+===================================================================
+--- a/src/plugins/properties/Makefile.in
++++ b/src/plugins/properties/Makefile.in
@@ -137,6 +137,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4387,9 +4742,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/publish/Makefile.in totem-2.30.0/src/plugins/publish/Makefile.in
---- totem-2.30.0.old/src/plugins/publish/Makefile.in 2010-03-29 18:22:38.000000000 +0200
-+++ totem-2.30.0/src/plugins/publish/Makefile.in 2010-03-31 13:33:43.876479568 +0200
+Index: b/src/plugins/publish/Makefile.in
+===================================================================
+--- a/src/plugins/publish/Makefile.in
++++ b/src/plugins/publish/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4408,9 +4764,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/pythonconsole/Makefile.in totem-2.30.0/src/plugins/pythonconsole/Makefile.in
---- totem-2.30.0.old/src/plugins/pythonconsole/Makefile.in 2010-03-29 18:22:38.000000000 +0200
-+++ totem-2.30.0/src/plugins/pythonconsole/Makefile.in 2010-03-31 13:33:43.960481019 +0200
+Index: b/src/plugins/pythonconsole/Makefile.in
+===================================================================
+--- a/src/plugins/pythonconsole/Makefile.in
++++ b/src/plugins/pythonconsole/Makefile.in
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4429,9 +4786,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/sample-python/Makefile.in totem-2.30.0/src/plugins/sample-python/Makefile.in
---- totem-2.30.0.old/src/plugins/sample-python/Makefile.in 2010-03-29 18:22:38.000000000 +0200
-+++ totem-2.30.0/src/plugins/sample-python/Makefile.in 2010-03-31 13:33:44.056481282 +0200
+Index: b/src/plugins/sample-python/Makefile.in
+===================================================================
+--- a/src/plugins/sample-python/Makefile.in
++++ b/src/plugins/sample-python/Makefile.in
@@ -67,6 +67,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4450,9 +4808,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/sample-vala/Makefile.in totem-2.30.0/src/plugins/sample-vala/Makefile.in
---- totem-2.30.0.old/src/plugins/sample-vala/Makefile.in 2010-03-29 18:22:38.000000000 +0200
-+++ totem-2.30.0/src/plugins/sample-vala/Makefile.in 2010-03-31 13:33:44.168480928 +0200
+Index: b/src/plugins/sample-vala/Makefile.in
+===================================================================
+--- a/src/plugins/sample-vala/Makefile.in
++++ b/src/plugins/sample-vala/Makefile.in
@@ -129,6 +129,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4471,9 +4830,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/screensaver/Makefile.in totem-2.30.0/src/plugins/screensaver/Makefile.in
---- totem-2.30.0.old/src/plugins/screensaver/Makefile.in 2010-03-29 18:22:38.000000000 +0200
-+++ totem-2.30.0/src/plugins/screensaver/Makefile.in 2010-03-31 13:33:44.276481181 +0200
+Index: b/src/plugins/screensaver/Makefile.in
+===================================================================
+--- a/src/plugins/screensaver/Makefile.in
++++ b/src/plugins/screensaver/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4492,9 +4852,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/screenshot/Makefile.in totem-2.30.0/src/plugins/screenshot/Makefile.in
---- totem-2.30.0.old/src/plugins/screenshot/Makefile.in 2010-03-29 18:22:38.000000000 +0200
-+++ totem-2.30.0/src/plugins/screenshot/Makefile.in 2010-03-31 13:33:44.392479015 +0200
+Index: b/src/plugins/screenshot/Makefile.in
+===================================================================
+--- a/src/plugins/screenshot/Makefile.in
++++ b/src/plugins/screenshot/Makefile.in
@@ -131,6 +131,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4513,9 +4874,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/sidebar-test/Makefile.in totem-2.30.0/src/plugins/sidebar-test/Makefile.in
---- totem-2.30.0.old/src/plugins/sidebar-test/Makefile.in 2010-03-29 18:22:39.000000000 +0200
-+++ totem-2.30.0/src/plugins/sidebar-test/Makefile.in 2010-03-31 13:33:44.492481456 +0200
+Index: b/src/plugins/sidebar-test/Makefile.in
+===================================================================
+--- a/src/plugins/sidebar-test/Makefile.in
++++ b/src/plugins/sidebar-test/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4534,9 +4896,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/skipto/Makefile.in totem-2.30.0/src/plugins/skipto/Makefile.in
---- totem-2.30.0.old/src/plugins/skipto/Makefile.in 2010-03-29 18:22:39.000000000 +0200
-+++ totem-2.30.0/src/plugins/skipto/Makefile.in 2010-03-31 13:33:44.604480540 +0200
+Index: b/src/plugins/skipto/Makefile.in
+===================================================================
+--- a/src/plugins/skipto/Makefile.in
++++ b/src/plugins/skipto/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4555,9 +4918,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/thumbnail/Makefile.in totem-2.30.0/src/plugins/thumbnail/Makefile.in
---- totem-2.30.0.old/src/plugins/thumbnail/Makefile.in 2010-03-29 18:22:39.000000000 +0200
-+++ totem-2.30.0/src/plugins/thumbnail/Makefile.in 2010-03-31 13:33:44.708480847 +0200
+Index: b/src/plugins/thumbnail/Makefile.in
+===================================================================
+--- a/src/plugins/thumbnail/Makefile.in
++++ b/src/plugins/thumbnail/Makefile.in
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4576,9 +4940,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/totem/Makefile.in totem-2.30.0/src/plugins/totem/Makefile.in
---- totem-2.30.0.old/src/plugins/totem/Makefile.in 2010-03-29 18:22:39.000000000 +0200
-+++ totem-2.30.0/src/plugins/totem/Makefile.in 2010-03-31 13:33:44.784480242 +0200
+Index: b/src/plugins/totem/Makefile.in
+===================================================================
+--- a/src/plugins/totem/Makefile.in
++++ b/src/plugins/totem/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4597,9 +4962,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/tracker/Makefile.in totem-2.30.0/src/plugins/tracker/Makefile.in
---- totem-2.30.0.old/src/plugins/tracker/Makefile.in 2010-03-29 18:22:39.000000000 +0200
-+++ totem-2.30.0/src/plugins/tracker/Makefile.in 2010-03-31 13:33:44.892479085 +0200
+Index: b/src/plugins/tracker/Makefile.in
+===================================================================
+--- a/src/plugins/tracker/Makefile.in
++++ b/src/plugins/tracker/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -4618,9 +4984,10 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-diff -Naur totem-2.30.0.old/src/plugins/youtube/Makefile.in totem-2.30.0/src/plugins/youtube/Makefile.in
---- totem-2.30.0.old/src/plugins/youtube/Makefile.in 2010-03-29 18:22:40.000000000 +0200
-+++ totem-2.30.0/src/plugins/youtube/Makefile.in 2010-03-31 13:33:44.996479380 +0200
+Index: b/src/plugins/youtube/Makefile.in
+===================================================================
+--- a/src/plugins/youtube/Makefile.in
++++ b/src/plugins/youtube/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
More information about the pkg-gnome-commits
mailing list