r24075 - in /desktop/experimental/totem/debian: changelog control control.in patches/02_tracker_0.8.patch patches/90_autotools.patch patches/series

slomo at users.alioth.debian.org slomo at users.alioth.debian.org
Wed Apr 28 12:42:57 UTC 2010


Author: slomo
Date: Wed Apr 28 12:42:56 2010
New Revision: 24075

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24075
Log:
* New upstream bugfix release:
  + debian/control.in:
    - Update build dependencies.
  + debian/patches/02_tracker_0.8.patch:
    - Dropped, merged upstream.
  + debian/patches/90_autotools.patch:
    - Updated for the new version.

Removed:
    desktop/experimental/totem/debian/patches/02_tracker_0.8.patch
Modified:
    desktop/experimental/totem/debian/changelog
    desktop/experimental/totem/debian/control
    desktop/experimental/totem/debian/control.in
    desktop/experimental/totem/debian/patches/90_autotools.patch
    desktop/experimental/totem/debian/patches/series

Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=24075&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog [utf-8] (original)
+++ desktop/experimental/totem/debian/changelog [utf-8] Wed Apr 28 12:42:56 2010
@@ -1,10 +1,20 @@
-totem (2.30.0-3) UNRELEASED; urgency=low
-
+totem (2.30.1-1) experimental; urgency=low
+
+  [ Loïc Minier ]
   * totem.preinst: Actually remove alternatives by checking for action
     "upgrade" instead of "configure" which isn't used with preinsts; bump
     verison to 2.30.0-2 for that to be effective.
 
- -- Loïc Minier <lool at debian.org>  Mon, 19 Apr 2010 12:56:45 +0200
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/control.in:
+      - Update build dependencies.
+    + debian/patches/02_tracker_0.8.patch:
+      - Dropped, merged upstream.
+    + debian/patches/90_autotools.patch:
+      - Updated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 28 Apr 2010 14:41:52 +0200
 
 totem (2.30.0-2) experimental; urgency=low
 

Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=24075&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control [utf-8] (original)
+++ desktop/experimental/totem/debian/control [utf-8] Wed Apr 28 12:42:56 2010
@@ -7,7 +7,7 @@
 Section: video
 Priority: optional
 Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 5.0.51~),
                cdbs,
                quilt,
@@ -23,7 +23,7 @@
                libirman-dev (>= 0.4.2),
                gnome-pkg-tools (>= 0.10),
                scrollkeeper,
-               libgstreamer0.10-dev (>= 0.10.26),
+               libgstreamer0.10-dev (>= 0.10.28.1),
                libgstreamer-plugins-base0.10-dev (>= 0.10.26),
                gstreamer0.10-tools (>= 0.10.26),
                gstreamer0.10-plugins-base (>= 0.10.26),
@@ -31,7 +31,6 @@
                librsvg2-dev (>= 2.16.0-2),
                librsvg2-common (>= 2.16.0-2),
                libnautilus-extension-dev (>= 2.22),
-               iso-codes,
                libmusicbrainz4-dev (>= 2.1.1-4.1),
                gnome-icon-theme (>= 2.15.90),
                libdbus-glib-1-dev (>= 0.61),
@@ -71,7 +70,6 @@
          gstreamer0.10-plugins-good (>= 0.10.7),
          gstreamer0.10-x,
          gnome-icon-theme (>= 2.15.90),
-         iso-codes,
          totem-common (= ${source:Version})
 Conflicts: totem (<< 0.99.12-2),
            gnome-control-center (<< 2.15.90),

Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=24075&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in [utf-8] (original)
+++ desktop/experimental/totem/debian/control.in [utf-8] Wed Apr 28 12:42:56 2010
@@ -18,7 +18,7 @@
                libirman-dev (>= 0.4.2),
                gnome-pkg-tools (>= 0.10),
                scrollkeeper,
-               libgstreamer0.10-dev (>= 0.10.26),
+               libgstreamer0.10-dev (>= 0.10.28.1),
                libgstreamer-plugins-base0.10-dev (>= 0.10.26),
                gstreamer0.10-tools (>= 0.10.26),
                gstreamer0.10-plugins-base (>= 0.10.26),
@@ -26,7 +26,6 @@
                librsvg2-dev (>= 2.16.0-2),
                librsvg2-common (>= 2.16.0-2),
                libnautilus-extension-dev (>= 2.22),
-               iso-codes,
                libmusicbrainz4-dev (>= 2.1.1-4.1),
                gnome-icon-theme (>= 2.15.90),
                libdbus-glib-1-dev (>= 0.61),
@@ -66,7 +65,6 @@
          gstreamer0.10-plugins-good (>= 0.10.7),
          gstreamer0.10-x,
          gnome-icon-theme (>= 2.15.90),
-         iso-codes,
          totem-common (= ${source:Version})
 Conflicts: totem (<< 0.99.12-2),
            gnome-control-center (<< 2.15.90),

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=24075&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] Wed Apr 28 12:42:56 2010
@@ -1,29 +1,6 @@
-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
+diff -Naur totem-2.30.1.old/aclocal.m4 totem-2.30.1/aclocal.m4
+--- totem-2.30.1.old/aclocal.m4	2010-04-27 11:24:46.000000000 +0200
++++ totem-2.30.1/aclocal.m4	2010-04-28 14:40:51.160119516 +0200
 @@ -757,6 +757,12 @@
  [
    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
@@ -274,10 +251,9 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-Index: b/bindings/Makefile.in
-===================================================================
---- a/bindings/Makefile.in
-+++ b/bindings/Makefile.in
+diff -Naur totem-2.30.1.old/bindings/Makefile.in totem-2.30.1/bindings/Makefile.in
+--- totem-2.30.1.old/bindings/Makefile.in	2010-04-27 11:24:49.000000000 +0200
++++ totem-2.30.1/bindings/Makefile.in	2010-04-28 14:40:58.428117884 +0200
 @@ -109,6 +109,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -296,10 +272,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/bindings/python/Makefile.in
-===================================================================
---- a/bindings/python/Makefile.in
-+++ b/bindings/python/Makefile.in
+diff -Naur totem-2.30.1.old/bindings/python/Makefile.in totem-2.30.1/bindings/python/Makefile.in
+--- totem-2.30.1.old/bindings/python/Makefile.in	2010-04-27 11:24:49.000000000 +0200
++++ totem-2.30.1/bindings/python/Makefile.in	2010-04-28 14:40:58.728117957 +0200
 @@ -106,6 +106,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -318,10 +293,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/bindings/vala/Makefile.in
-===================================================================
---- a/bindings/vala/Makefile.in
-+++ b/bindings/vala/Makefile.in
+diff -Naur totem-2.30.1.old/bindings/vala/Makefile.in totem-2.30.1/bindings/vala/Makefile.in
+--- totem-2.30.1.old/bindings/vala/Makefile.in	2010-04-27 11:24:49.000000000 +0200
++++ totem-2.30.1/bindings/vala/Makefile.in	2010-04-28 14:40:58.932120346 +0200
 @@ -70,6 +70,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -340,10 +314,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/browser-plugin/Makefile.in
-===================================================================
---- a/browser-plugin/Makefile.in
-+++ b/browser-plugin/Makefile.in
+diff -Naur totem-2.30.1.old/browser-plugin/Makefile.in totem-2.30.1/browser-plugin/Makefile.in
+--- totem-2.30.1.old/browser-plugin/Makefile.in	2010-04-27 11:24:50.000000000 +0200
++++ totem-2.30.1/browser-plugin/Makefile.in	2010-04-28 14:40:59.596120879 +0200
 @@ -304,6 +304,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -362,99 +335,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-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
+diff -Naur totem-2.30.1.old/configure totem-2.30.1/configure
+--- totem-2.30.1.old/configure	2010-04-27 11:25:00.000000000 +0200
++++ totem-2.30.1/configure	2010-04-28 14:40:54.664120233 +0200
 @@ -753,12 +753,20 @@
  AM_CFLAGS
  AM_CPPFLAGS
@@ -477,7 +360,7 @@
  DISABLE_DEPRECATED
  WARN_CXXFLAGS
  WARN_CFLAGS
-@@ -805,6 +813,8 @@
+@@ -807,6 +815,8 @@
  LIBEPC_CFLAGS
  BEMUSED_LIBS
  BEMUSED_CFLAGS
@@ -486,7 +369,7 @@
  GMYTH_LIBS
  GMYTH_CFLAGS
  LIRC_LIBS
-@@ -1086,6 +1096,8 @@
+@@ -1087,6 +1097,8 @@
  enable_iso_cxx
  with_html_dir
  enable_gtk_doc
@@ -495,7 +378,7 @@
  enable_run_in_source_tree
  '
        ac_precious_vars='build_alias
-@@ -1131,6 +1143,8 @@
+@@ -1132,6 +1144,8 @@
  MEDIA_PLAYER_KEYS_LIBS
  GMYTH_CFLAGS
  GMYTH_LIBS
@@ -504,7 +387,7 @@
  BEMUSED_CFLAGS
  BEMUSED_LIBS
  LIBEPC_CFLAGS
-@@ -1813,6 +1827,8 @@
+@@ -1815,6 +1829,8 @@
  
    --enable-iso-cxx        Try to warn if code is not ISO C++
    --enable-gtk-doc        use gtk-doc to build documentation [[default=no]]
@@ -513,7 +396,7 @@
    --disable-run-in-source-tree
                            disable search for UI files and plugins in local
                            directory
-@@ -1898,6 +1914,8 @@
+@@ -1900,6 +1916,8 @@
    GMYTH_CFLAGS
                C compiler flags for GMYTH, overriding pkg-config
    GMYTH_LIBS  linker flags for GMYTH, overriding pkg-config
@@ -522,24 +405,24 @@
    BEMUSED_CFLAGS
                C compiler flags for BEMUSED, overriding pkg-config
    BEMUSED_LIBS
-@@ -7307,13 +7325,13 @@
+@@ -7313,13 +7331,13 @@
  else
    lt_cv_nm_interface="BSD nm"
    echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:7310: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:7328: $ac_compile\"" >&5)
+-  (eval echo "\"\$as_me:7316: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:7334: $ac_compile\"" >&5)
    (eval "$ac_compile" 2>conftest.err)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:7313: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:7331: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+-  (eval echo "\"\$as_me:7319: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:7337: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
    cat conftest.err >&5
--  (eval echo "\"\$as_me:7316: output\"" >&5)
-+  (eval echo "\"\$as_me:7334: output\"" >&5)
+-  (eval echo "\"\$as_me:7322: output\"" >&5)
++  (eval echo "\"\$as_me:7340: output\"" >&5)
    cat conftest.out >&5
    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
      lt_cv_nm_interface="MS dumpbin"
-@@ -7768,11 +7786,11 @@
+@@ -7774,11 +7792,11 @@
    ;;
  
  # This must be Linux ELF.
@@ -553,30 +436,30 @@
    if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -8507,7 +8525,7 @@
+@@ -8513,7 +8531,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 8510 "configure"' > conftest.$ac_ext
-+  echo '#line 8528 "configure"' > conftest.$ac_ext
+-  echo '#line 8516 "configure"' > conftest.$ac_ext
++  echo '#line 8534 "configure"' > conftest.$ac_ext
    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -10292,11 +10310,11 @@
+@@ -10298,11 +10316,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:10295: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10301: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10319: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:10299: \$? = $ac_status" >&5
-+   echo "$as_me:10317: \$? = $ac_status" >&5
+-   echo "$as_me:10305: \$? = $ac_status" >&5
++   echo "$as_me:10323: \$? = $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.
-@@ -10461,7 +10479,7 @@
+@@ -10467,7 +10485,7 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -585,49 +468,49 @@
        case $cc_basename in
        # old Intel for x86_64 which still supported -KPIC.
        ecc*)
-@@ -10631,11 +10649,11 @@
+@@ -10637,11 +10655,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:10634: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10652: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10640: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10658: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:10638: \$? = $ac_status" >&5
-+   echo "$as_me:10656: \$? = $ac_status" >&5
+-   echo "$as_me:10644: \$? = $ac_status" >&5
++   echo "$as_me:10662: \$? = $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.
-@@ -10736,11 +10754,11 @@
+@@ -10742,11 +10760,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:10739: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10757: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10745: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10763: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:10743: \$? = $ac_status" >&5
-+   echo "$as_me:10761: \$? = $ac_status" >&5
+-   echo "$as_me:10749: \$? = $ac_status" >&5
++   echo "$as_me:10767: \$? = $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
-@@ -10791,11 +10809,11 @@
+@@ -10797,11 +10815,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:10794: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10812: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:10800: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10818: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:10798: \$? = $ac_status" >&5
-+   echo "$as_me:10816: \$? = $ac_status" >&5
+-   echo "$as_me:10804: \$? = $ac_status" >&5
++   echo "$as_me:10822: \$? = $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
-@@ -10910,6 +10928,9 @@
+@@ -10916,6 +10934,9 @@
    openbsd*)
      with_gnu_ld=no
      ;;
@@ -637,7 +520,7 @@
    esac
  
    ld_shlibs=yes
-@@ -10931,6 +10952,7 @@
+@@ -10937,6 +10958,7 @@
      fi
      supports_anon_versioning=no
      case `$LD -v 2>&1` in
@@ -645,7 +528,7 @@
        *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -11022,7 +11044,7 @@
+@@ -11028,7 +11050,7 @@
        archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
        ;;
  
@@ -654,7 +537,7 @@
        tmp_diet=no
        if test "$host_os" = linux-dietlibc; then
  	case $cc_basename in
-@@ -11092,7 +11114,7 @@
+@@ -11098,7 +11120,7 @@
        fi
        ;;
  
@@ -663,7 +546,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -11267,6 +11289,7 @@
+@@ -11273,6 +11295,7 @@
  	if test "$aix_use_runtimelinking" = yes; then
  	  shared_flag="$shared_flag "'${wl}-G'
  	fi
@@ -671,7 +554,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11593,7 +11616,7 @@
+@@ -11599,7 +11622,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -680,7 +563,7 @@
        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -12483,7 +12506,7 @@
+@@ -12489,7 +12512,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -689,7 +572,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -12523,13 +12546,10 @@
+@@ -12529,13 +12552,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -704,7 +587,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -12541,6 +12561,18 @@
+@@ -12547,6 +12567,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -723,25 +606,25 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -13161,7 +13193,7 @@
+@@ -13167,7 +13199,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 13164 "configure"
-+#line 13196 "configure"
+-#line 13170 "configure"
++#line 13202 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -13257,7 +13289,7 @@
+@@ -13263,7 +13295,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<_LT_EOF
--#line 13260 "configure"
-+#line 13292 "configure"
+-#line 13266 "configure"
++#line 13298 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -14197,7 +14229,7 @@
+@@ -14203,7 +14235,7 @@
          inherit_rpath_CXX=yes
          ;;
  
@@ -750,7 +633,7 @@
          case $cc_basename in
            KCC*)
  	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -15025,7 +15057,7 @@
+@@ -15031,7 +15063,7 @@
  	    ;;
  	esac
  	;;
@@ -759,7 +642,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -15089,7 +15121,7 @@
+@@ -15095,7 +15127,7 @@
  	    ;;
  	esac
  	;;
@@ -768,49 +651,49 @@
  	;;
        *qnx* | *nto*)
          # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -15213,11 +15245,11 @@
+@@ -15219,11 +15251,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:15216: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15248: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15222: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15254: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:15220: \$? = $ac_status" >&5
-+   echo "$as_me:15252: \$? = $ac_status" >&5
+-   echo "$as_me:15226: \$? = $ac_status" >&5
++   echo "$as_me:15258: \$? = $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.
-@@ -15312,11 +15344,11 @@
+@@ -15318,11 +15350,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:15315: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15347: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15321: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15353: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:15319: \$? = $ac_status" >&5
-+   echo "$as_me:15351: \$? = $ac_status" >&5
+-   echo "$as_me:15325: \$? = $ac_status" >&5
++   echo "$as_me:15357: \$? = $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
-@@ -15364,11 +15396,11 @@
+@@ -15370,11 +15402,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:15367: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15399: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15373: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15405: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:15371: \$? = $ac_status" >&5
-+   echo "$as_me:15403: \$? = $ac_status" >&5
+-   echo "$as_me:15377: \$? = $ac_status" >&5
++   echo "$as_me:15409: \$? = $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
-@@ -15440,6 +15472,9 @@
+@@ -15446,6 +15478,9 @@
    cygwin* | mingw* | cegcc*)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
@@ -820,7 +703,7 @@
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    ;;
-@@ -15939,7 +15974,7 @@
+@@ -15945,7 +15980,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -829,7 +712,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -15979,13 +16014,10 @@
+@@ -15985,13 +16020,10 @@
    # before this can be enabled.
    hardcode_into_libs=yes
  
@@ -844,7 +727,7 @@
    fi
  
    # We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15997,6 +16029,18 @@
+@@ -16003,6 +16035,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -863,7 +746,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -18156,7 +18200,7 @@
+@@ -18162,7 +18206,7 @@
  
  
  # The full list of plugins
@@ -872,7 +755,7 @@
  
  PLUGINDIR='${libdir}/totem/plugins'
  
-@@ -18194,10 +18238,11 @@
+@@ -18200,10 +18244,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MISSING_PLUGINS" >&5
  $as_echo_n "checking for MISSING_PLUGINS... " >&6; }
  
@@ -888,7 +771,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5
    ac_status=$?
-@@ -18207,13 +18252,15 @@
+@@ -18213,13 +18258,15 @@
  else
    pkg_failed=yes
  fi
@@ -910,19 +793,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-plugins-base-0.10\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gstreamer-plugins-base-0.10") 2>&5
    ac_status=$?
-@@ -18223,8 +18270,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18237,9 +18285,9 @@
+@@ -18229,8 +18276,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18243,9 +18291,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -934,7 +817,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$MISSING_PLUGINS_PKG_ERRORS" >&5
-@@ -18288,10 +18336,11 @@
+@@ -18294,10 +18342,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GST" >&5
  $as_echo_n "checking for GST... " >&6; }
  
@@ -950,7 +833,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
-@@ -18301,13 +18350,15 @@
+@@ -18307,13 +18356,15 @@
  else
    pkg_failed=yes
  fi
@@ -972,19 +855,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
-@@ -18317,8 +18368,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18331,9 +18383,9 @@
+@@ -18323,8 +18374,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18337,9 +18389,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -996,7 +879,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GST_PKG_ERRORS" >&5
-@@ -18492,10 +18544,11 @@
+@@ -18456,10 +18508,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SMCLIENT" >&5
  $as_echo_n "checking for SMCLIENT... " >&6; }
  
@@ -1012,7 +895,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5
    ac_status=$?
-@@ -18505,13 +18558,15 @@
+@@ -18469,13 +18522,15 @@
  else
    pkg_failed=yes
  fi
@@ -1034,19 +917,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SMCLIENT_PKGS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$SMCLIENT_PKGS") 2>&5
    ac_status=$?
-@@ -18521,8 +18576,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18535,9 +18591,9 @@
+@@ -18485,8 +18540,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18499,9 +18555,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1058,7 +941,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$SMCLIENT_PKG_ERRORS" >&5
-@@ -18617,10 +18673,11 @@
+@@ -18581,10 +18637,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPENDENCY" >&5
  $as_echo_n "checking for DEPENDENCY... " >&6; }
  
@@ -1074,7 +957,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    glib-2.0 >= \$GLIB_REQS
    gio-2.0
-@@ -18651,13 +18708,15 @@
+@@ -18618,13 +18675,15 @@
  else
    pkg_failed=yes
  fi
@@ -1096,19 +979,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
    glib-2.0 >= \$GLIB_REQS
    gio-2.0
-@@ -18688,8 +18747,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18702,23 +18762,23 @@
+@@ -18658,8 +18717,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18672,7 +18732,7 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1117,9 +1000,10 @@
    glib-2.0 >= $GLIB_REQS
    gio-2.0
    gtk+-2.0 >= $GTK_REQS
-   gmodule-2.0
+@@ -18680,9 +18740,9 @@
    gconf-2.0
    totem-plparser >= $TOTEM_PLPARSER_REQS
+   gstreamer-tag-0.10 >= 0.10.26
 -  cairo" 2>&1`
 +  cairo"`
          else
@@ -1128,15 +1012,16 @@
    glib-2.0 >= $GLIB_REQS
    gio-2.0
    gtk+-2.0 >= $GTK_REQS
-   gmodule-2.0
+@@ -18690,7 +18750,7 @@
    gconf-2.0
    totem-plparser >= $TOTEM_PLPARSER_REQS
+   gstreamer-tag-0.10 >= 0.10.26
 -  cairo" 2>&1`
 +  cairo"`
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DEPENDENCY_PKG_ERRORS" >&5
-@@ -18767,10 +18827,11 @@
+@@ -18740,10 +18800,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MM" >&5
  $as_echo_n "checking for MM... " >&6; }
  
@@ -1152,7 +1037,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
-@@ -18780,13 +18841,15 @@
+@@ -18753,13 +18814,15 @@
  else
    pkg_failed=yes
  fi
@@ -1174,19 +1059,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$MM\""; } >&5
    ($PKG_CONFIG --exists --print-errors "$MM") 2>&5
    ac_status=$?
-@@ -18796,8 +18859,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18810,9 +18874,9 @@
+@@ -18769,8 +18832,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18783,9 +18847,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1198,7 +1083,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$MM_PKG_ERRORS" >&5
-@@ -18854,10 +18918,11 @@
+@@ -18827,10 +18891,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
  $as_echo_n "checking for GTK... " >&6; }
  
@@ -1214,7 +1099,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5
    ac_status=$?
-@@ -18867,13 +18932,15 @@
+@@ -18840,13 +18905,15 @@
  else
    pkg_failed=yes
  fi
@@ -1236,19 +1121,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 gthread-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gtk+-2.0 gthread-2.0") 2>&5
    ac_status=$?
-@@ -18883,8 +18950,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -18897,9 +18965,9 @@
+@@ -18856,8 +18923,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18870,9 +18938,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1260,7 +1145,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GTK_PKG_ERRORS" >&5
-@@ -18958,10 +19026,11 @@
+@@ -18931,10 +18999,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5
  $as_echo_n "checking for UNIQUE... " >&6; }
  
@@ -1276,7 +1161,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5
    ac_status=$?
-@@ -18971,13 +19040,15 @@
+@@ -18944,13 +19013,15 @@
  else
    pkg_failed=yes
  fi
@@ -1298,19 +1183,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5
    ac_status=$?
-@@ -18987,8 +19058,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19001,9 +19073,9 @@
+@@ -18960,8 +19031,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -18974,9 +19046,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1322,7 +1207,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$UNIQUE_PKG_ERRORS" >&5
-@@ -19300,10 +19372,11 @@
+@@ -19273,10 +19345,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XVIDMODE" >&5
  $as_echo_n "checking for XVIDMODE... " >&6; }
  
@@ -1338,7 +1223,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5
    ac_status=$?
-@@ -19313,13 +19386,15 @@
+@@ -19286,13 +19359,15 @@
  else
    pkg_failed=yes
  fi
@@ -1360,19 +1245,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrandr >= 1.1.1 xxf86vm >= 1.0.1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "xrandr >= 1.1.1 xxf86vm >= 1.0.1") 2>&5
    ac_status=$?
-@@ -19329,8 +19404,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19343,9 +19419,9 @@
+@@ -19302,8 +19377,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19316,9 +19392,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1384,7 +1269,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$XVIDMODE_PKG_ERRORS" >&5
-@@ -19690,10 +19766,11 @@
+@@ -19663,10 +19739,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PYGTK" >&5
  $as_echo_n "checking for PYGTK... " >&6; }
  
@@ -1400,7 +1285,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		pygtk-2.0 >= \$PYGTK_REQUIRED
  		totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5
-@@ -19709,13 +19786,15 @@
+@@ -19682,13 +19759,15 @@
  else
    pkg_failed=yes
  fi
@@ -1422,19 +1307,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"
  		pygtk-2.0 >= \$PYGTK_REQUIRED
  		totem-plparser >= \$TOTEM_PLPARSER_REQS\""; } >&5
-@@ -19731,8 +19810,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19745,13 +19825,13 @@
+@@ -19704,8 +19783,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19718,13 +19798,13 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1452,7 +1337,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$PYGTK_PKG_ERRORS" >&5
-@@ -19883,10 +19963,11 @@
+@@ -19856,10 +19936,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VALA" >&5
  $as_echo_n "checking for VALA... " >&6; }
  
@@ -1468,7 +1353,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5
    ac_status=$?
-@@ -19896,13 +19977,15 @@
+@@ -19869,13 +19950,15 @@
  else
    pkg_failed=yes
  fi
@@ -1490,19 +1375,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"vala-1.0 >= \$VALA_REQS\""; } >&5
    ($PKG_CONFIG --exists --print-errors "vala-1.0 >= $VALA_REQS") 2>&5
    ac_status=$?
-@@ -19912,8 +19995,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -19926,9 +20010,9 @@
+@@ -19885,8 +19968,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -19899,9 +19983,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1514,7 +1399,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$VALA_PKG_ERRORS" >&5
-@@ -20027,10 +20111,11 @@
+@@ -20000,10 +20084,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SCREENSAVER" >&5
  $as_echo_n "checking for SCREENSAVER... " >&6; }
  
@@ -1530,7 +1415,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
    ac_status=$?
-@@ -20040,13 +20125,15 @@
+@@ -20013,13 +20098,15 @@
  else
    pkg_failed=yes
  fi
@@ -1552,19 +1437,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gconf-2.0") 2>&5
    ac_status=$?
-@@ -20056,8 +20143,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20070,9 +20158,9 @@
+@@ -20029,8 +20116,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20043,9 +20131,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1576,7 +1461,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$SCREENSAVER_PKG_ERRORS" >&5
-@@ -20115,10 +20203,11 @@
+@@ -20088,10 +20176,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGALAGO" >&5
  $as_echo_n "checking for LIBGALAGO... " >&6; }
  
@@ -1592,7 +1477,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5
    ac_status=$?
-@@ -20128,13 +20217,15 @@
+@@ -20101,13 +20190,15 @@
  else
    pkg_failed=yes
  fi
@@ -1614,19 +1499,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgalago >= 0.5.2\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libgalago >= 0.5.2") 2>&5
    ac_status=$?
-@@ -20144,8 +20235,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20158,9 +20250,9 @@
+@@ -20117,8 +20208,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20131,9 +20223,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1638,7 +1523,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGALAGO_PKG_ERRORS" >&5
-@@ -20194,10 +20286,11 @@
+@@ -20167,10 +20259,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEDIA_PLAYER_KEYS" >&5
  $as_echo_n "checking for MEDIA_PLAYER_KEYS... " >&6; }
  
@@ -1654,7 +1539,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
    ac_status=$?
-@@ -20207,13 +20300,15 @@
+@@ -20180,13 +20273,15 @@
  else
    pkg_failed=yes
  fi
@@ -1676,19 +1561,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1\""; } >&5
    ($PKG_CONFIG --exists --print-errors "dbus-glib-1") 2>&5
    ac_status=$?
-@@ -20223,8 +20318,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20237,9 +20333,9 @@
+@@ -20196,8 +20291,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20210,9 +20306,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1700,7 +1585,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$MEDIA_PLAYER_KEYS_PKG_ERRORS" >&5
-@@ -20324,10 +20420,11 @@
+@@ -20297,10 +20393,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMYTH" >&5
  $as_echo_n "checking for GMYTH... " >&6; }
  
@@ -1716,7 +1601,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
    ac_status=$?
-@@ -20337,13 +20434,15 @@
+@@ -20310,13 +20407,15 @@
  else
    pkg_failed=yes
  fi
@@ -1738,19 +1623,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
    ac_status=$?
-@@ -20353,8 +20452,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20367,9 +20467,9 @@
+@@ -20326,8 +20425,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20340,9 +20440,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1762,7 +1647,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GMYTH_PKG_ERRORS" >&5
-@@ -20391,16 +20491,111 @@
+@@ -20364,16 +20464,111 @@
  				add_plugin="0"
  			fi
  		;;
@@ -1878,7 +1763,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5
    ($PKG_CONFIG --exists --print-errors "bluez") 2>&5
    ac_status=$?
-@@ -20410,13 +20605,15 @@
+@@ -20383,13 +20578,15 @@
  else
    pkg_failed=yes
  fi
@@ -1900,19 +1785,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"bluez\""; } >&5
    ($PKG_CONFIG --exists --print-errors "bluez") 2>&5
    ac_status=$?
-@@ -20426,8 +20623,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20440,9 +20638,9 @@
+@@ -20399,8 +20596,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20413,9 +20611,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1924,7 +1809,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$BEMUSED_PKG_ERRORS" >&5
-@@ -20470,10 +20668,11 @@
+@@ -20443,10 +20641,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5
  $as_echo_n "checking for LIBEPC... " >&6; }
  
@@ -1940,7 +1825,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
    ac_status=$?
-@@ -20483,13 +20682,15 @@
+@@ -20456,13 +20655,15 @@
  else
    pkg_failed=yes
  fi
@@ -1962,19 +1847,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
    ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
    ac_status=$?
-@@ -20499,8 +20700,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20513,9 +20715,9 @@
+@@ -20472,8 +20673,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20486,9 +20688,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -1986,7 +1871,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBEPC_PKG_ERRORS" >&5
-@@ -20543,37 +20745,41 @@
+@@ -20516,10 +20718,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
  $as_echo_n "checking for TRACKER... " >&6; }
  
@@ -1994,20 +1879,15 @@
 -    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.8 >= 0.8.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.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=$?
-   $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`
+@@ -20529,13 +20732,15 @@
  else
    pkg_failed=yes
  fi
@@ -2021,139 +1901,101 @@
 -    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.8 >= 0.8.1\""; } >&5
-+  ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.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=$?
-   $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
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20586,9 +20792,9 @@
+@@ -20545,8 +20750,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20559,9 +20765,9 @@
          _pkg_short_errors_supported=no
  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 --print-errors "tracker-client-0.8 >= 0.8.1" 2>&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 --print-errors "tracker-client-0.8 >= 0.8.1" 2>&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
-@@ -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; }
-+
+@@ -20584,10 +20790,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
+ $as_echo_n "checking for TRACKER... " >&6; }
+ 
+-if test -n "$TRACKER_CFLAGS"; then
+-    pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
 +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
+     { { $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=$?
+@@ -20597,13 +20804,15 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+-if test -n "$TRACKER_LIBS"; then
+-    pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
 +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
+     { { $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=$?
+@@ -20613,8 +20822,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20627,9 +20837,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.9 >= 0.9.0" 2>&1`
 +	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"`
-+        else
+         else
+-	        TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.9 >= 0.9.0" 2>&1`
 +	        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 @@
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$TRACKER_PKG_ERRORS" >&5
+@@ -20665,10 +20875,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
  $as_echo_n "checking for GLIB... " >&6; }
  
@@ -2169,7 +2011,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 +20916,15 @@
+@@ -20678,13 +20889,15 @@
  else
    pkg_failed=yes
  fi
@@ -2191,19 +2033,19 @@
      { { $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 +20934,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20665,9 +20949,9 @@
+@@ -20694,8 +20907,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20708,9 +20922,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2215,7 +2057,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$GLIB_PKG_ERRORS" >&5
-@@ -20695,10 +20979,11 @@
+@@ -20738,10 +20952,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DISC_RECORDER" >&5
  $as_echo_n "checking for DISC_RECORDER... " >&6; }
  
@@ -2231,7 +2073,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 +20993,15 @@
+@@ -20751,13 +20966,15 @@
  else
    pkg_failed=yes
  fi
@@ -2253,19 +2095,19 @@
      { { $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 +21011,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20738,9 +21026,9 @@
+@@ -20767,8 +20984,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20781,9 +20999,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2277,7 +2119,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DISC_RECORDER_PKG_ERRORS" >&5
-@@ -20768,10 +21056,11 @@
+@@ -20811,10 +21029,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA" >&5
  $as_echo_n "checking for LIBGDATA... " >&6; }
  
@@ -2293,7 +2135,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 +21070,15 @@
+@@ -20824,13 +21043,15 @@
  else
    pkg_failed=yes
  fi
@@ -2315,19 +2157,19 @@
      { { $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 +21088,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20811,9 +21103,9 @@
+@@ -20840,8 +21061,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20854,9 +21076,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2339,7 +2181,69 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBGDATA_PKG_ERRORS" >&5
-@@ -20898,10 +21190,11 @@
+@@ -20884,10 +21106,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGDATA_0_7" >&5
+ $as_echo_n "checking for LIBGDATA_0_7... " >&6; }
+ 
+-if test -n "$LIBGDATA_0_7_CFLAGS"; then
+-    pkg_cv_LIBGDATA_0_7_CFLAGS="$LIBGDATA_0_7_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$LIBGDATA_0_7_CFLAGS"; then
++        pkg_cv_LIBGDATA_0_7_CFLAGS="$LIBGDATA_0_7_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.7.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgdata >= 0.7.0") 2>&5
+   ac_status=$?
+@@ -20897,13 +21120,15 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+-if test -n "$LIBGDATA_0_7_LIBS"; then
+-    pkg_cv_LIBGDATA_0_7_LIBS="$LIBGDATA_0_7_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+-    if test -n "$PKG_CONFIG" && \
++if test -n "$PKG_CONFIG"; then
++    if test -n "$LIBGDATA_0_7_LIBS"; then
++        pkg_cv_LIBGDATA_0_7_LIBS="$LIBGDATA_0_7_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgdata >= 0.7.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgdata >= 0.7.0") 2>&5
+   ac_status=$?
+@@ -20913,8 +21138,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -20927,9 +21153,9 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgdata >= 0.7.0" 2>&1`
++	        LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgdata >= 0.7.0"`
+         else
+-	        LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgdata >= 0.7.0" 2>&1`
++	        LIBGDATA_0_7_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgdata >= 0.7.0"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBGDATA_0_7_PKG_ERRORS" >&5
+@@ -21013,10 +21239,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BROWSER_PLUGIN" >&5
  $as_echo_n "checking for BROWSER_PLUGIN... " >&6; }
  
@@ -2355,7 +2259,7 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
  		 gio-2.0
  		 x11
-@@ -20920,13 +21213,15 @@
+@@ -21035,13 +21262,15 @@
  else
    pkg_failed=yes
  fi
@@ -2377,19 +2281,19 @@
      { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0
  		 gio-2.0
  		 x11
-@@ -20945,8 +21240,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -20959,15 +21255,15 @@
+@@ -21060,8 +21289,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21074,15 +21304,15 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2409,7 +2313,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5
-@@ -21007,10 +21303,11 @@
+@@ -21122,10 +21352,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
  $as_echo_n "checking for DBUS... " >&6; }
  
@@ -2425,7 +2329,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 +21317,15 @@
+@@ -21135,13 +21366,15 @@
  else
    pkg_failed=yes
  fi
@@ -2447,19 +2351,19 @@
      { { $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 +21335,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21050,9 +21350,9 @@
+@@ -21151,8 +21384,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21165,9 +21399,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2471,7 +2375,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DBUS_PKG_ERRORS" >&5
-@@ -21279,10 +21579,11 @@
+@@ -21394,10 +21628,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
  $as_echo_n "checking for NAUTILUS... " >&6; }
  
@@ -2487,7 +2391,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 +21593,15 @@
+@@ -21407,13 +21642,15 @@
  else
    pkg_failed=yes
  fi
@@ -2509,19 +2413,19 @@
      { { $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 +21611,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21322,9 +21626,9 @@
+@@ -21423,8 +21660,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21437,9 +21675,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2533,7 +2437,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$NAUTILUS_PKG_ERRORS" >&5
-@@ -21392,10 +21696,11 @@
+@@ -21507,10 +21745,11 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
  $as_echo_n "checking for DBUS... " >&6; }
  
@@ -2549,7 +2453,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 +21710,15 @@
+@@ -21520,13 +21759,15 @@
  else
    pkg_failed=yes
  fi
@@ -2571,19 +2475,19 @@
      { { $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 +21728,9 @@
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -21435,9 +21743,9 @@
+@@ -21536,8 +21777,9 @@
+ else
+   pkg_failed=yes
+ fi
+- else
+-    pkg_failed=untried
++    fi
++else
++	pkg_failed=untried
+ fi
+ 
+ 
+@@ -21550,9 +21792,9 @@
          _pkg_short_errors_supported=no
  fi
          if test $_pkg_short_errors_supported = yes; then
@@ -2595,7 +2499,7 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$DBUS_PKG_ERRORS" >&5
-@@ -21771,54 +22079,58 @@
+@@ -21886,54 +22128,58 @@
  
  
  
@@ -2687,7 +2591,7 @@
    ;;
    *)
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -21828,7 +22140,7 @@
+@@ -21943,7 +22189,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
@@ -2696,7 +2600,7 @@
      $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
    fi
-@@ -21839,18 +22151,116 @@
+@@ -21954,18 +22200,116 @@
    ;;
  esac
  fi
@@ -2716,7 +2620,7 @@
  
 -  test -n "$GTKDOC_CHECK" && break
 +  test -n "$GTKDOC_REBASE" && break
-+done
+ done
 +test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
 +
 +  # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
@@ -2742,7 +2646,7 @@
 +    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
- done
++done
 +  done
 +IFS=$as_save_IFS
 +
@@ -2818,7 +2722,7 @@
  
  
     if test x$enable_gtk_doc = xyes; then
-@@ -21861,6 +22271,22 @@
+@@ -21976,6 +22320,22 @@
    ENABLE_GTK_DOC_FALSE=
  fi
  
@@ -2841,7 +2745,7 @@
     if test -n "$LIBTOOL"; then
    GTK_DOC_USE_LIBTOOL_TRUE=
    GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -21869,6 +22295,14 @@
+@@ -21984,6 +22344,14 @@
    GTK_DOC_USE_LIBTOOL_FALSE=
  fi
  
@@ -2856,7 +2760,7 @@
  
  
  # This macro expands DIR and assigns it to RET.
-@@ -21917,7 +22351,7 @@
+@@ -22032,7 +22400,7 @@
  
  
  
@@ -2865,7 +2769,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -22120,10 +22554,22 @@
+@@ -22235,10 +22603,22 @@
    as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
  Usually this means the macro was only invoked conditionally." "$LINENO" 5
  fi
@@ -2888,7 +2792,7 @@
  
  : ${CONFIG_STATUS=./config.status}
  ac_write_fail=0
-@@ -23083,6 +23529,7 @@
+@@ -23198,6 +23578,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" ;;
@@ -2896,10 +2800,156 @@
      "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" ;;
-Index: b/data/Makefile.in
-===================================================================
---- a/data/Makefile.in
-+++ b/data/Makefile.in
+diff -Naur totem-2.30.1.old/data/icons/16x16/Makefile.in totem-2.30.1/data/icons/16x16/Makefile.in
+--- totem-2.30.1.old/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 14:41:00.040120603 +0200
+@@ -91,6 +91,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@
+@@ -147,6 +149,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.1.old/data/icons/22x22/Makefile.in totem-2.30.1/data/icons/22x22/Makefile.in
+--- totem-2.30.1.old/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 14:41:00.252118212 +0200
+@@ -91,6 +91,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@
+@@ -147,6 +149,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.1.old/data/icons/24x24/Makefile.in totem-2.30.1/data/icons/24x24/Makefile.in
+--- totem-2.30.1.old/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 14:41:00.464121341 +0200
+@@ -91,6 +91,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@
+@@ -147,6 +149,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.1.old/data/icons/32x32/Makefile.in totem-2.30.1/data/icons/32x32/Makefile.in
+--- totem-2.30.1.old/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 14:41:00.632120496 +0200
+@@ -91,6 +91,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@
+@@ -147,6 +149,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.1.old/data/icons/48x48/Makefile.in totem-2.30.1/data/icons/48x48/Makefile.in
+--- totem-2.30.1.old/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 14:41:00.820120004 +0200
+@@ -91,6 +91,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@
+@@ -147,6 +149,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.1.old/data/icons/Makefile.in totem-2.30.1/data/icons/Makefile.in
+--- totem-2.30.1.old/data/icons/Makefile.in	2010-04-27 11:24:51.000000000 +0200
++++ totem-2.30.1/data/icons/Makefile.in	2010-04-28 14:41:00.984120951 +0200
+@@ -107,6 +107,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@
+@@ -163,6 +165,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.1.old/data/icons/scalable/Makefile.in totem-2.30.1/data/icons/scalable/Makefile.in
+--- totem-2.30.1.old/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 14:41:01.196119270 +0200
+@@ -91,6 +91,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@
+@@ -147,6 +149,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.1.old/data/Makefile.in totem-2.30.1/data/Makefile.in
+--- totem-2.30.1.old/data/Makefile.in	2010-04-27 11:24:50.000000000 +0200
++++ totem-2.30.1/data/Makefile.in	2010-04-28 14:40:59.836117640 +0200
 @@ -141,6 +141,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -2918,120 +2968,9 @@
  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@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -147,6 +149,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/22x22/Makefile.in
-===================================================================
---- a/data/icons/22x22/Makefile.in
-+++ b/data/icons/22x22/Makefile.in
-@@ -91,6 +91,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@
-@@ -147,6 +149,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/24x24/Makefile.in
-===================================================================
---- a/data/icons/24x24/Makefile.in
-+++ b/data/icons/24x24/Makefile.in
-@@ -91,6 +91,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@
-@@ -147,6 +149,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/32x32/Makefile.in
-===================================================================
---- a/data/icons/32x32/Makefile.in
-+++ b/data/icons/32x32/Makefile.in
-@@ -91,6 +91,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@
-@@ -147,6 +149,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/48x48/Makefile.in
-===================================================================
---- a/data/icons/48x48/Makefile.in
-+++ b/data/icons/48x48/Makefile.in
-@@ -91,6 +91,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@
-@@ -147,6 +149,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/Makefile.in
-===================================================================
---- a/data/icons/Makefile.in
-+++ b/data/icons/Makefile.in
+diff -Naur totem-2.30.1.old/docs/Makefile.in totem-2.30.1/docs/Makefile.in
+--- totem-2.30.1.old/docs/Makefile.in	2010-04-27 11:24:52.000000000 +0200
++++ totem-2.30.1/docs/Makefile.in	2010-04-28 14:41:01.504118049 +0200
 @@ -107,6 +107,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -3050,54 +2989,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-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@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -147,6 +149,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/docs/Makefile.in
-===================================================================
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -107,6 +107,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@
-@@ -163,6 +165,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/docs/reference/Makefile.in
-===================================================================
---- a/docs/reference/Makefile.in
-+++ b/docs/reference/Makefile.in
+diff -Naur totem-2.30.1.old/docs/reference/Makefile.in totem-2.30.1/docs/reference/Makefile.in
+--- totem-2.30.1.old/docs/reference/Makefile.in	2010-04-27 11:24:52.000000000 +0200
++++ totem-2.30.1/docs/reference/Makefile.in	2010-04-28 14:41:01.720120503 +0200
 @@ -76,6 +76,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -3116,7 +3010,7 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -409,10 +413,10 @@
+@@ -411,10 +415,10 @@
  	$(DEPENDENCY_LIBS)
  
  @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -3130,7 +3024,7 @@
  @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
  
  # We set GPATH here; this gives us semantics for GNU make
-@@ -431,7 +435,9 @@
+@@ -433,7 +437,9 @@
  	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
  	version.xml.in
  DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
@@ -3141,7 +3035,7 @@
  
  SCANOBJ_FILES = \
  	$(DOC_MODULE).args 	 \
-@@ -446,6 +452,10 @@
+@@ -448,6 +454,10 @@
  	$(DOC_MODULE)-unused.txt
  
  CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
@@ -3152,7 +3046,7 @@
  @ENABLE_GTK_DOC_TRUE at TESTS_ENVIRONMENT = cd $(srcdir) && 
  @ENABLE_GTK_DOC_TRUE at TESTS = $(GTKDOC_CHECK)
  all: all-am
-@@ -736,10 +746,10 @@
+@@ -738,10 +748,10 @@
  	uninstall-local
  
  
@@ -3165,7 +3059,7 @@
  
  $(REPORT_FILES): sgml-build.stamp
  
-@@ -748,9 +758,9 @@
+@@ -750,9 +760,9 @@
  scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
  	@echo 'gtk-doc: Scanning header files'
  	@-chmod -R u+w $(srcdir)
@@ -3177,7 +3071,7 @@
  	    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) ; \
-@@ -758,7 +768,7 @@
+@@ -760,7 +770,7 @@
                 test -f $$i || touch $$i ; \
  	    done \
  	fi
@@ -3186,7 +3080,7 @@
  
  $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
  	@true
-@@ -768,23 +778,23 @@
+@@ -770,23 +780,23 @@
  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)
@@ -3216,7 +3110,7 @@
  
  sgml.stamp: sgml-build.stamp
  	@true
-@@ -794,18 +804,37 @@
+@@ -796,18 +806,37 @@
  html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
  	@echo 'gtk-doc: Building HTML'
  	@-chmod -R u+w $(srcdir)
@@ -3262,7 +3156,7 @@
  
  ##############
  
-@@ -815,14 +844,14 @@
+@@ -817,14 +846,14 @@
  
  distclean-local:
  	cd $(srcdir) && \
@@ -3279,7 +3173,7 @@
  	if test "$$installfiles" = '$(srcdir)/html/*'; \
  	then echo '-- Nothing to install' ; \
  	else \
-@@ -842,12 +871,11 @@
+@@ -844,12 +873,11 @@
  	    mv -f $${installdir}/$(DOC_MODULE).devhelp \
  	      $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
  	  fi; \
@@ -3294,7 +3188,7 @@
  	  installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
  	else \
  	  installdir="$(DESTDIR)$(TARGET_DIR)"; \
-@@ -864,16 +892,14 @@
+@@ -866,16 +894,14 @@
  
  dist-hook: dist-check-gtkdoc dist-hook-local
  	mkdir $(distdir)/tmpl
@@ -3313,10 +3207,9 @@
  
  .PHONY : dist-hook-local docs
  
-Index: b/gnome-doc-utils.make
-===================================================================
---- a/gnome-doc-utils.make
-+++ b/gnome-doc-utils.make
+diff -Naur totem-2.30.1.old/gnome-doc-utils.make totem-2.30.1/gnome-doc-utils.make
+--- totem-2.30.1.old/gnome-doc-utils.make	2010-04-12 19:27:44.000000000 +0200
++++ totem-2.30.1/gnome-doc-utils.make	2010-04-28 14:40:44.016117758 +0200
 @@ -266,6 +266,13 @@
  .PHONY: po
  po: $(_DOC_POFILES)
@@ -3374,10 +3267,9 @@
  	@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
+diff -Naur totem-2.30.1.old/gtk-doc.make totem-2.30.1/gtk-doc.make
+--- totem-2.30.1.old/gtk-doc.make	2010-04-12 19:27:44.000000000 +0200
++++ totem-2.30.1/gtk-doc.make	2010-04-28 14:40:43.872120889 +0200
 @@ -5,13 +5,13 @@
  ####################################
  
@@ -3580,10 +3472,9 @@
 +	$(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
  
  .PHONY : dist-hook-local docs
-Index: b/help/Makefile.in
-===================================================================
---- a/help/Makefile.in
-+++ b/help/Makefile.in
+diff -Naur totem-2.30.1.old/help/Makefile.in totem-2.30.1/help/Makefile.in
+--- totem-2.30.1.old/help/Makefile.in	2010-04-27 11:24:52.000000000 +0200
++++ totem-2.30.1/help/Makefile.in	2010-04-28 14:41:01.852120301 +0200
 @@ -92,6 +92,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -3602,7 +3493,7 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-@@ -386,6 +390,7 @@
+@@ -388,6 +392,7 @@
  _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID),					\
  	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
  
@@ -3610,7 +3501,7 @@
  _DOC_LC_MODULES = $(if $(DOC_MODULE),						\
  	$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
  
-@@ -741,6 +746,9 @@
+@@ -743,6 +748,9 @@
  .PHONY: po
  po: $(_DOC_POFILES)
  
@@ -3620,7 +3511,7 @@
  $(_DOC_POFILES):
  	@if ! test -d $(dir $@); then \
  	  echo "mkdir $(dir $@)"; \
-@@ -768,16 +776,23 @@
+@@ -770,16 +778,23 @@
  	    $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
  	fi
  
@@ -3648,7 +3539,7 @@
  	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
  	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
  .PHONY: pot
-@@ -803,12 +818,14 @@
+@@ -805,12 +820,14 @@
  clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
  clean-doc-lc:
  	rm -f $(_DOC_LC_DOCS)
@@ -3663,10 +3554,9 @@
  	@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
+diff -Naur totem-2.30.1.old/lib/Makefile.in totem-2.30.1/lib/Makefile.in
+--- totem-2.30.1.old/lib/Makefile.in	2010-04-27 11:24:52.000000000 +0200
++++ totem-2.30.1/lib/Makefile.in	2010-04-28 14:41:01.964119944 +0200
 @@ -104,6 +104,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -3685,10 +3575,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/ltmain.sh
-===================================================================
---- a/ltmain.sh
-+++ b/ltmain.sh
+diff -Naur totem-2.30.1.old/ltmain.sh totem-2.30.1/ltmain.sh
+--- totem-2.30.1.old/ltmain.sh	2010-04-12 19:27:44.000000000 +0200
++++ totem-2.30.1/ltmain.sh	2010-04-28 14:40:42.016117620 +0200
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -3767,10 +3656,51 @@
  	  esac
  	  ;;
  	no)
-Index: b/src/Makefile.in
-===================================================================
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+diff -Naur totem-2.30.1.old/Makefile.in totem-2.30.1/Makefile.in
+--- totem-2.30.1.old/Makefile.in	2010-04-27 11:24:58.000000000 +0200
++++ totem-2.30.1/Makefile.in	2010-04-28 14:41:11.308120365 +0200
+@@ -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@
+diff -Naur totem-2.30.1.old/src/backend/Makefile.in totem-2.30.1/src/backend/Makefile.in
+--- totem-2.30.1.old/src/backend/Makefile.in	2010-04-27 11:24:53.000000000 +0200
++++ totem-2.30.1/src/backend/Makefile.in	2010-04-28 14:41:03.276118675 +0200
+@@ -121,6 +121,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@
+@@ -177,6 +179,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.1.old/src/Makefile.in totem-2.30.1/src/Makefile.in
+--- totem-2.30.1.old/src/Makefile.in	2010-04-27 11:24:53.000000000 +0200
++++ totem-2.30.1/src/Makefile.in	2010-04-28 14:41:02.440119827 +0200
 @@ -343,6 +343,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -3789,55 +3719,10 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/backend/Makefile.in
-===================================================================
---- a/src/backend/Makefile.in
-+++ b/src/backend/Makefile.in
-@@ -121,6 +121,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@
-@@ -177,6 +179,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/src/plugins/Makefile.in
-===================================================================
---- a/src/plugins/Makefile.in
-+++ b/src/plugins/Makefile.in
-@@ -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@
-Index: b/src/plugins/bbc/Makefile.in
-===================================================================
---- /dev/null
-+++ b/src/plugins/bbc/Makefile.in
-@@ -0,0 +1,596 @@
+diff -Naur totem-2.30.1.old/src/plugins/bbc/Makefile.in totem-2.30.1/src/plugins/bbc/Makefile.in
+--- totem-2.30.1.old/src/plugins/bbc/Makefile.in	1970-01-01 01:00:00.000000000 +0100
++++ totem-2.30.1/src/plugins/bbc/Makefile.in	2010-04-28 14:41:04.656121522 +0200
+@@ -0,0 +1,598 @@
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
 +# @configure_input@
 +
@@ -4014,6 +3899,8 @@
 +LIBEPC_LIBS = @LIBEPC_LIBS@
 +LIBGALAGO_CFLAGS = @LIBGALAGO_CFLAGS@
 +LIBGALAGO_LIBS = @LIBGALAGO_LIBS@
++LIBGDATA_0_7_CFLAGS = @LIBGDATA_0_7_CFLAGS@
++LIBGDATA_0_7_LIBS = @LIBGDATA_0_7_LIBS@
 +LIBGDATA_CFLAGS = @LIBGDATA_CFLAGS@
 +LIBGDATA_LIBS = @LIBGDATA_LIBS@
 +LIBOBJS = @LIBOBJS@
@@ -4434,10 +4321,9 @@
 +# 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:
-Index: b/src/plugins/bemused/Makefile.in
-===================================================================
---- a/src/plugins/bemused/Makefile.in
-+++ b/src/plugins/bemused/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/bemused/Makefile.in totem-2.30.1/src/plugins/bemused/Makefile.in
+--- totem-2.30.1.old/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 14:41:04.868120101 +0200
 @@ -125,6 +125,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4456,10 +4342,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-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
+diff -Naur totem-2.30.1.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.30.1/src/plugins/brasero-disc-recorder/Makefile.in
+--- totem-2.30.1.old/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 14:41:05.080121079 +0200
 @@ -128,6 +128,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4478,10 +4363,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/coherence_upnp/Makefile.in
-===================================================================
---- a/src/plugins/coherence_upnp/Makefile.in
-+++ b/src/plugins/coherence_upnp/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/coherence_upnp/Makefile.in totem-2.30.1/src/plugins/coherence_upnp/Makefile.in
+--- totem-2.30.1.old/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 14:41:05.316118308 +0200
 @@ -93,6 +93,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4500,10 +4384,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/dbus-service/Makefile.in
-===================================================================
---- a/src/plugins/dbus-service/Makefile.in
-+++ b/src/plugins/dbus-service/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/dbus-service/Makefile.in totem-2.30.1/src/plugins/dbus-service/Makefile.in
+--- totem-2.30.1.old/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 14:41:05.564117788 +0200
 @@ -93,6 +93,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4522,10 +4405,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/galago/Makefile.in
-===================================================================
---- a/src/plugins/galago/Makefile.in
-+++ b/src/plugins/galago/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/galago/Makefile.in totem-2.30.1/src/plugins/galago/Makefile.in
+--- totem-2.30.1.old/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 14:41:05.800118721 +0200
 @@ -125,6 +125,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4544,10 +4426,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/gromit/Makefile.in
-===================================================================
---- a/src/plugins/gromit/Makefile.in
-+++ b/src/plugins/gromit/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/gromit/Makefile.in totem-2.30.1/src/plugins/gromit/Makefile.in
+--- totem-2.30.1.old/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 14:41:06.080120592 +0200
 @@ -124,6 +124,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4566,10 +4447,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/iplayer/Makefile.in
-===================================================================
---- a/src/plugins/iplayer/Makefile.in
-+++ b/src/plugins/iplayer/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/iplayer/Makefile.in totem-2.30.1/src/plugins/iplayer/Makefile.in
+--- totem-2.30.1.old/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 14:41:06.260119576 +0200
 @@ -94,6 +94,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4588,10 +4468,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/jamendo/Makefile.in
-===================================================================
---- a/src/plugins/jamendo/Makefile.in
-+++ b/src/plugins/jamendo/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/jamendo/Makefile.in totem-2.30.1/src/plugins/jamendo/Makefile.in
+--- totem-2.30.1.old/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 14:41:06.436119528 +0200
 @@ -94,6 +94,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4610,10 +4489,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/lirc/Makefile.in
-===================================================================
---- a/src/plugins/lirc/Makefile.in
-+++ b/src/plugins/lirc/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/lirc/Makefile.in totem-2.30.1/src/plugins/lirc/Makefile.in
+--- totem-2.30.1.old/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 14:41:06.720120013 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4632,10 +4510,30 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-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
+diff -Naur totem-2.30.1.old/src/plugins/Makefile.in totem-2.30.1/src/plugins/Makefile.in
+--- totem-2.30.1.old/src/plugins/Makefile.in	2010-04-27 11:24:53.000000000 +0200
++++ totem-2.30.1/src/plugins/Makefile.in	2010-04-28 14:41:03.528121240 +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.1.old/src/plugins/media-player-keys/Makefile.in totem-2.30.1/src/plugins/media-player-keys/Makefile.in
+--- totem-2.30.1.old/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 14:41:06.952117861 +0200
 @@ -130,6 +130,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4654,10 +4552,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/mythtv/Makefile.in
-===================================================================
---- a/src/plugins/mythtv/Makefile.in
-+++ b/src/plugins/mythtv/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/mythtv/Makefile.in totem-2.30.1/src/plugins/mythtv/Makefile.in
+--- totem-2.30.1.old/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 14:41:07.276117697 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4676,10 +4573,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/ontop/Makefile.in
-===================================================================
---- a/src/plugins/ontop/Makefile.in
-+++ b/src/plugins/ontop/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/ontop/Makefile.in totem-2.30.1/src/plugins/ontop/Makefile.in
+--- totem-2.30.1.old/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 14:41:07.484120114 +0200
 @@ -124,6 +124,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4698,10 +4594,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/opensubtitles/Makefile.in
-===================================================================
---- a/src/plugins/opensubtitles/Makefile.in
-+++ b/src/plugins/opensubtitles/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/opensubtitles/Makefile.in totem-2.30.1/src/plugins/opensubtitles/Makefile.in
+--- totem-2.30.1.old/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 14:41:07.756121164 +0200
 @@ -94,6 +94,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4720,10 +4615,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/properties/Makefile.in
-===================================================================
---- a/src/plugins/properties/Makefile.in
-+++ b/src/plugins/properties/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/properties/Makefile.in totem-2.30.1/src/plugins/properties/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.120120439 +0200
 @@ -137,6 +137,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4742,10 +4636,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/publish/Makefile.in
-===================================================================
---- a/src/plugins/publish/Makefile.in
-+++ b/src/plugins/publish/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/publish/Makefile.in totem-2.30.1/src/plugins/publish/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.340120102 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4764,10 +4657,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/pythonconsole/Makefile.in
-===================================================================
---- a/src/plugins/pythonconsole/Makefile.in
-+++ b/src/plugins/pythonconsole/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/pythonconsole/Makefile.in totem-2.30.1/src/plugins/pythonconsole/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.484120391 +0200
 @@ -93,6 +93,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4786,10 +4678,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/sample-python/Makefile.in
-===================================================================
---- a/src/plugins/sample-python/Makefile.in
-+++ b/src/plugins/sample-python/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/sample-python/Makefile.in totem-2.30.1/src/plugins/sample-python/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.568120112 +0200
 @@ -67,6 +67,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4808,10 +4699,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/sample-vala/Makefile.in
-===================================================================
---- a/src/plugins/sample-vala/Makefile.in
-+++ b/src/plugins/sample-vala/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/sample-vala/Makefile.in totem-2.30.1/src/plugins/sample-vala/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.676120011 +0200
 @@ -129,6 +129,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4830,10 +4720,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/screensaver/Makefile.in
-===================================================================
---- a/src/plugins/screensaver/Makefile.in
-+++ b/src/plugins/screensaver/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/screensaver/Makefile.in totem-2.30.1/src/plugins/screensaver/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.796120377 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4852,10 +4741,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/screenshot/Makefile.in
-===================================================================
---- a/src/plugins/screenshot/Makefile.in
-+++ b/src/plugins/screenshot/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/screenshot/Makefile.in totem-2.30.1/src/plugins/screenshot/Makefile.in
+--- totem-2.30.1.old/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 14:41:09.916119779 +0200
 @@ -131,6 +131,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4874,10 +4762,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/sidebar-test/Makefile.in
-===================================================================
---- a/src/plugins/sidebar-test/Makefile.in
-+++ b/src/plugins/sidebar-test/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/sidebar-test/Makefile.in totem-2.30.1/src/plugins/sidebar-test/Makefile.in
+--- totem-2.30.1.old/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 14:41:10.136120865 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4896,10 +4783,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/skipto/Makefile.in
-===================================================================
---- a/src/plugins/skipto/Makefile.in
-+++ b/src/plugins/skipto/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/skipto/Makefile.in totem-2.30.1/src/plugins/skipto/Makefile.in
+--- totem-2.30.1.old/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 14:41:10.368120033 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4918,10 +4804,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/thumbnail/Makefile.in
-===================================================================
---- a/src/plugins/thumbnail/Makefile.in
-+++ b/src/plugins/thumbnail/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/thumbnail/Makefile.in totem-2.30.1/src/plugins/thumbnail/Makefile.in
+--- totem-2.30.1.old/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 14:41:10.500120124 +0200
 @@ -125,6 +125,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4940,10 +4825,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/totem/Makefile.in
-===================================================================
---- a/src/plugins/totem/Makefile.in
-+++ b/src/plugins/totem/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/totem/Makefile.in totem-2.30.1/src/plugins/totem/Makefile.in
+--- totem-2.30.1.old/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 14:41:10.588119863 +0200
 @@ -91,6 +91,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4962,10 +4846,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/tracker/Makefile.in
-===================================================================
---- a/src/plugins/tracker/Makefile.in
-+++ b/src/plugins/tracker/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/tracker/Makefile.in totem-2.30.1/src/plugins/tracker/Makefile.in
+--- totem-2.30.1.old/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 14:41:10.704120357 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@
@@ -4984,10 +4867,9 @@
  GTK_CFLAGS = @GTK_CFLAGS@
  GTK_LIBS = @GTK_LIBS@
  HELP_DIR = @HELP_DIR@
-Index: b/src/plugins/youtube/Makefile.in
-===================================================================
---- a/src/plugins/youtube/Makefile.in
-+++ b/src/plugins/youtube/Makefile.in
+diff -Naur totem-2.30.1.old/src/plugins/youtube/Makefile.in totem-2.30.1/src/plugins/youtube/Makefile.in
+--- totem-2.30.1.old/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 14:41:10.816119566 +0200
 @@ -126,6 +126,8 @@
  AUTOHEADER = @AUTOHEADER@
  AUTOMAKE = @AUTOMAKE@

Modified: desktop/experimental/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/series?rev=24075&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/series [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/series [utf-8] Wed Apr 28 12:42:56 2010
@@ -1,4 +1,3 @@
 01_fake_keypresses.patch
-02_tracker_0.8.patch
 70_bbc_plugin.patch
 90_autotools.patch




More information about the pkg-gnome-commits mailing list