--- totem-2.21.92.orig/config.sub
+++ totem-2.21.92/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
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2008-01-16'
+timestamp='2007-06-28'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
 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
+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."
@@ -369,14 +369,10 @@
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
+	| xstormy16-* | xtensa-* \
 	| ymp-* \
 	| z8k-*)
 		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
 	# Recognize the various machine names and aliases which stand
 	# for a CPU type and a company and sometimes even an OS.
 	386bsd)
@@ -447,14 +443,6 @@
 		basic_machine=ns32k-sequent
 		os=-dynix
 		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
@@ -680,14 +668,6 @@
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	m88k-omron*)
 		basic_machine=m88k-omron
 		;;
@@ -833,14 +813,6 @@
 		basic_machine=i860-intel
 		os=-osf
 		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
 	pbd)
 		basic_machine=sparc-tti
 		;;
@@ -1049,10 +1021,6 @@
 		basic_machine=tic6x-unknown
 		os=-coff
 		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
 	tx39)
 		basic_machine=mipstx39-unknown
 		;;
--- totem-2.21.92.orig/config.guess
+++ totem-2.21.92/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
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
 
-timestamp='2008-01-08'
+timestamp='2007-07-22'
 
 # 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,8 @@
 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
+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."
@@ -532,7 +532,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[45])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -799,9 +799,6 @@
 	    EM64T | authenticamd)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
 	esac ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -836,14 +833,7 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -964,8 +954,8 @@
     x86_64:Linux:*:*)
 	echo x86_64-unknown-linux-gnu
 	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    xtensa:Linux:*:*)
+    	echo xtensa-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
--- totem-2.21.92.orig/debian/bug/control
+++ totem-2.21.92/debian/bug/control
@@ -0,0 +1 @@
+report-with: totem-gstreamer totem-xine
--- totem-2.21.92.orig/debian/patches/30_totem_xulrunner19.patch
+++ totem-2.21.92/debian/patches/30_totem_xulrunner19.patch
@@ -0,0 +1,236 @@
+Summary:
+
+Fix configure.in to detect xulrunner-1.9 as gecko=mozilla 1.9
+  - update configure.in:
+
+Instructions:
+
+1. Drop this into debian/patches directory of totem package and add the filename
+used into the debian/patches/series file such that it gets applied _before_ the
+autoconf patch.
+2. Update autoconf patch by: QUILT_PATCHES=debian/patches quilt push -a; autoconf; quilt refresh --diffstat -U --no-timestamps
+3. Build as usually (e.g. dpkg-buildpackage -rfakeroot -b)
+
+Tested Package Versions:
+ + totem >= 2.21.2-0ubuntu2, build: OK, works: OK (asac)
+
+---
+ configure.in |   77 ++++++++++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 58 insertions(+), 19 deletions(-)
+
+Index: totem-2.21.92/configure.in
+===================================================================
+--- totem-2.21.92.orig/configure.in
++++ totem-2.21.92/configure.in
+@@ -585,23 +585,29 @@
+ 	AC_ARG_WITH([mozilla],[],[with_gecko=$withval])
+ 
+ 	GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla"
+ 	gecko=$with_gecko
+ 
+ 	if test -z "$with_gecko"; then
+ 		dnl Autodetect gecko
+ 		for g in $GECKOS; do
++			if $PKG_CONFIG --exists $g-plugin; then
++				gecko=$g
++				break;
++			fi
+ 			if $PKG_CONFIG --exists $g-xpcom; then
+ 				gecko=$g
+ 				break;
+ 			fi
+ 		done
+ 	elif ! $PKG_CONFIG --exists $gecko-xpcom; then
+-		AC_MSG_ERROR([Gecko "$gecko" not found])
++		if ! $PKG_CONFIG --exists $gecko-plugin; then
++			AC_MSG_ERROR([Gecko "$gecko" not found])
++		fi
+ 	fi
+ 
+ 	if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then
+ 		dnl No gecko found, disable plugin
+ 		AC_MSG_WARN([No gecko found, disabling plugin])
+ 		enable_browser_plugins=no
+ 	elif test -z "$gecko"; then
+ 		AC_MSG_ERROR([No gecko found])
+@@ -629,34 +635,45 @@
+ 		PLUGIN_EXTRA_WARN_CXXFLAGS=
+ 	fi
+ 	AC_SUBST([PLUGIN_EXTRA_WARN_CXXFLAGS])
+ fi
+ 
+ # Check for mozilla modules, but keep the CFLAGS and LIBS in
+ # separate vars
+ if test "$enable_browser_plugins" = "yes" ; then
+-	PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
+-		[$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin],,
+-                [enable_browser_plugins=no])
++	if $PKG_CONFIG --exists $MOZILLA-plugin; then
++		MOZILLA_VERSION_MIN=1.9
++		PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++			[libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN],,
++        	         [enable_browser_plugins=no])
++ 	else
++		PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++			[$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
++			$MOZILLA-plugin],,
++			[enable_browser_plugins=no])
++	fi
+ fi
+ # Check for other required modules, and merge CFLAGS, but not link
+ # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4
+ if test "$enable_browser_plugins" = "yes" ; then
+ 	PKG_CHECK_MODULES([BROWSER_PLUGIN],
+ 		[glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
+ 		[],[enable_browser_plugins=no])
+ 
+ 	BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS"
+ 	AC_SUBST([BROWSER_PLUGIN_CFLAGS])
++	# for xul 1.9 we have to link anyway
++	if test "$MOZILLA_VERSION_MIN" = 1.9; then
++		BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS"
++	fi
+ 	AC_SUBST([BROWSER_PLUGIN_LIBS])
+ 
+ 	# Earlier versions misdetect playlists
+ 	PKG_CHECK_EXISTS([shared-mime-info >= 0.22],
+ 			[],
+ 			[AC_MSG_ERROR([
+ 				The Browser plugin requires shared-mime-info
+ 				>= 0.22 to function.])])
+@@ -678,20 +695,28 @@
+ 	PKG_CHECK_MODULES([SN], [ libstartup-notification-1.0 >= 0.8 ], [enable_browser_plugins=yes], [enable_browser_plugins=no])
+ 	if test "x$enable_browser_plugins" != "xyes" ; then
+ 		AC_MSG_WARN([libstartup-notification not found, necessary to build the plugin viewer])
+ 	fi
+ fi
+ 
+ # Sets some variables, and check for xpidl
+ if test "$enable_browser_plugins" = "yes" ; then
+-	MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`"
+-	MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`"
+-	MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+-	MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++	if $PKG_CONFIG --exists $MOZILLA-plugin; then
++		MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++		MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin"
++		MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`"
++		MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`"
++	else
++		MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++		MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`"
++		MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++		MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`"
++	fi
++
+ 	MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}"
+ 
+ 	AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH])
+ 	if test "x$MOZILLA_XPIDL" = "xno"; then
+ 		AC_MSG_ERROR([xpidl compiler not found])
+ 	fi
+ 
+ 	AC_PATH_PROG([MOZILLA_XPT_LINK],[xpt_link],[no],[$MOZILLA_LIBDIR:$PATH])
+@@ -703,18 +728,22 @@
+ 	AC_SUBST([MOZILLA_LIBDIR])
+ 	AC_SUBST([MOZILLA_XPCOM_CFLAGS])
+ 	AC_SUBST([MOZILLA_INCLUDE_ROOT])
+ 	AC_ARG_VAR([MOZILLA_PLUGINDIR],[Where to install the plugin to])
+ fi
+ 
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
+-	dnl This only works on gecko 1.8
+-	MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++	dnl This only works on gecko 1.9 and 1.8
++	if $PKG_CONFIG --exists libxul; then
++		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++	else
++		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++	fi
+ 	dnl Fallback for older versions
+ 	if test "x$MOZILLA_IDLDIR" = "x"; then
+ 		MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
+ 	fi
+ 	dnl Some distributions (Gentoo) have it in unusual places
+ 	if test "x$MOZILLA_IDLDIR" = "x"; then
+ 		MOZILLA_IDLDIR="$MOZILLA_INCLUDE_ROOT/idl"
+ 	fi
+@@ -736,18 +765,24 @@
+ 	AC_LANG_PUSH([C++])
+ 	__SAVE_CPPFLAGS=$CPPFLAGS
+ 	__SAVE_CXXFLAGS=$CXXFLAGS
+ 	__SAVE_LIBS=$LIBS
+ 	__SAVE_LDFLAGS=$LDFLAGS
+ 
+ 	CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
+ 	CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
+-	LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
+-	LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++	if test $MOZILLA_VERSION_MIN = 1.9; then
++		CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++		LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS"
++		LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++        else 
++		LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
++		LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++	fi
+ 
+ 	AC_MSG_CHECKING([for libxpcomglue_s])
+ 	AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+ #include <mozilla-config.h>
+ #include <nsStringAPI.h>
+ 		]],[[
+ nsCString s;
+ const char *t = s.get ();
+@@ -758,17 +793,21 @@
+ 
+ 	CPPFLAGS=$__SAVE_CPPFLAGS
+ 	CXXFLAGS=$__SAVE_CXXFLAGS
+ 	LIBS=$__SAVE_LIBS
+ 	LDFLAGS=$__SAVE_LDFLAGS
+ 	AC_LANG_POP([C++])
+ 
+ 	if test "$have_libxpcomglue_s" = "yes"; then
+-		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++		if test $MOZILLA_VERSION_MIN = 1.9; then
++			LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS"
++		else
++			LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++		fi
+ 	else
+ 		AC_MSG_WARN([libxpcomglue_s not available; plugins may not be portable])
+ 	fi
+ fi
+ 
+ AC_SUBST([LIBXPCOMGLUE_S])
+ 
+ # check for -fno-rtti flag
+@@ -790,17 +829,17 @@
+ 	fi
+ fi
+ 
+ # check for some additional xpcom headers and for string compatibility
+ 
+ if test "$enable_browser_plugins" = "yes"; then
+ 	AC_LANG_PUSH([C++])
+ 	__SAVE_CPPFLAGS=$CPPFLAGS
+-	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom"
++	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
+ 
+ 	AC_CHECK_HEADERS([nsTArray.h])
+ 
+ 	AC_MSG_CHECKING([whether we need string glue])
+ 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+ 				#include <mozilla-config.h>
+ 				#include <nsStringAPI.h>
+ 		],[
--- totem-2.21.92.orig/debian/patches/20_use_alternatives.patch
+++ totem-2.21.92/debian/patches/20_use_alternatives.patch
@@ -0,0 +1,13 @@
+Index: totem-2.20.0/data/schemas.sh
+===================================================================
+--- totem-2.20.0.orig/data/schemas.sh	2007-08-26 01:05:12.000000000 +0200
++++ totem-2.20.0/data/schemas.sh	2007-09-25 14:54:52.714252335 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ 
+ OWNER=totem
+-COMMAND="$2/totem-video-thumbnailer -s %s %u %o"
++COMMAND="$2/gnome-video-thumbnailer -s %s %u %o"
+ 
+ . `dirname $0`/mime-functions.sh
+ 
--- totem-2.21.92.orig/debian/patches/70_autoconf.patch
+++ totem-2.21.92/debian/patches/70_autoconf.patch
@@ -0,0 +1,1498 @@
+---
+ aclocal.m4 |   38 +++--
+ configure  |  398 ++++++++++++++++++++++++++++++++++++++++++-------------------
+ 2 files changed, 303 insertions(+), 133 deletions(-)
+
+Index: totem-2.21.92/aclocal.m4
+===================================================================
+--- totem-2.21.92.orig/aclocal.m4
++++ totem-2.21.92/aclocal.m4
+@@ -926,17 +926,17 @@
+ # deprecated macros
+ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
+ # A hint is needed for aclocal from Automake <= 1.9.4:
+ # AC_DEFUN([AC_PROG_INTLTOOL], ...)
+ 
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 51 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+ # -----------------------------------------------------------
+ # If this macro is not defined by Autoconf, define it here.
+ m4_ifdef([AC_PROVIDE_IFELSE],
+          [],
+          [m4_define([AC_PROVIDE_IFELSE],
+@@ -1478,17 +1478,16 @@
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+     *64-bit*)
+-      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         ppc*-*linux*|powerpc*-*linux*)
+@@ -2537,35 +2536,46 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-netbsd*)
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++netbsd | netbsdelf*-gnu)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -3329,17 +3339,17 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   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
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+   fi
+   ;;
+ 
+ newos6*)
+@@ -4363,17 +4373,17 @@
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+     fi
+     # Workaround some broken pre-1.5 toolchains
+@@ -6419,17 +6429,20 @@
+     fi
+     ;;
+   pw32*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$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'
+   ;;
+-  *)
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++  ;;
++ *)
+     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   esac
+ ],[
+   runpath_var=
+   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+   _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+   _LT_AC_TAGVAR(archive_cmds, $1)=
+@@ -6624,22 +6637,23 @@
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+-      else
+-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++        _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++        else
++	   _LT_AC_TAGVAR(ld_shlibs, $1)=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+Index: totem-2.21.92/configure
+===================================================================
+--- totem-2.21.92.orig/configure
++++ totem-2.21.92/configure
+@@ -7637,17 +7637,17 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+ linux* | k*bsd*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   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
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+   fi
+   ;;
+ 
+ newos6*)
+@@ -7822,17 +7822,16 @@
+           LD="${LD-ld} -m elf_s390"
+           ;;
+         sparc64-*linux*)
+           LD="${LD-ld} -m elf32_sparc"
+           ;;
+       esac
+       ;;
+     *64-bit*)
+-      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+           ;;
+         x86_64-*linux*)
+           LD="${LD-ld} -m elf_x86_64"
+           ;;
+         ppc*-*linux*|powerpc*-*linux*)
+@@ -9554,21 +9553,21 @@
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:9562: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9561: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9566: \$? = $ac_status" >&5
++   echo "$as_me:9565: \$? = $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.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+@@ -9844,21 +9843,21 @@
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:9852: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9851: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9856: \$? = $ac_status" >&5
++   echo "$as_me:9855: \$? = $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.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works=yes
+      fi
+@@ -9948,21 +9947,21 @@
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:9956: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9955: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9960: \$? = $ac_status" >&5
++   echo "$as_me:9959: \$? = $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
+      # So say no if there are warnings
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o=yes
+@@ -10212,22 +10211,23 @@
+ 	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+-      else
+-	ld_shlibs=no
++        link_all_deplibs=no
++        else
++	   ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+ 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+@@ -11456,35 +11456,46 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-netbsd*)
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++netbsd | netbsdelf*-gnu)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -12299,17 +12310,17 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+   lt_cv_dlopen_self=cross
+ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12307 "configure"
++#line 12318 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #endif
+ 
+ #include <stdio.h>
+ 
+@@ -12399,17 +12410,17 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+   lt_cv_dlopen_self_static=cross
+ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12407 "configure"
++#line 12418 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+ #include <dlfcn.h>
+ #endif
+ 
+ #include <stdio.h>
+ 
+@@ -14009,17 +14020,17 @@
+ 	ld_shlibs_CXX=no
+ 	;;
+       *)
+ 	# FIXME: insert proper C++ library support
+ 	ld_shlibs_CXX=no
+ 	;;
+     esac
+     ;;
+-  netbsd*)
++  netbsd* | netbsdelf*-gnu)
+     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+       archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+       wlarc=
+       hardcode_libdir_flag_spec_CXX='-R$libdir'
+       hardcode_direct_CXX=yes
+       hardcode_shlibpath_var_CXX=no
+     fi
+     # Workaround some broken pre-1.5 toolchains
+@@ -14819,21 +14830,21 @@
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:14827: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14838: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14831: \$? = $ac_status" >&5
++   echo "$as_me:14842: \$? = $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.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_CXX=yes
+      fi
+@@ -14923,21 +14934,21 @@
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:14931: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14942: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14935: \$? = $ac_status" >&5
++   echo "$as_me:14946: \$? = $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
+      # So say no if there are warnings
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_CXX=yes
+@@ -14995,17 +15006,20 @@
+     fi
+     ;;
+   pw32*)
+     export_symbols_cmds_CXX="$ltdll_cmds"
+   ;;
+   cygwin* | mingw*)
+     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'
+   ;;
+-  *)
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
++  ;;
++ *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+   esac
+ 
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+ test "$ld_shlibs_CXX" = no && can_build_shared=no
+ 
+@@ -15424,35 +15438,46 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-netbsd*)
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++netbsd | netbsdelf*-gnu)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -16487,21 +16512,21 @@
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:16495: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16520: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16499: \$? = $ac_status" >&5
++   echo "$as_me:16524: \$? = $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.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_F77=yes
+      fi
+@@ -16591,21 +16616,21 @@
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:16599: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16624: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16603: \$? = $ac_status" >&5
++   echo "$as_me:16628: \$? = $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
+      # So say no if there are warnings
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_F77=yes
+@@ -16855,22 +16880,23 @@
+ 	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+-      else
+-	ld_shlibs_F77=no
++        link_all_deplibs_F77=no
++        else
++	   ld_shlibs_F77=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+ 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+@@ -18027,35 +18053,46 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-netbsd*)
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++netbsd | netbsdelf*-gnu)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -18780,21 +18817,21 @@
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:18788: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18825: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18792: \$? = $ac_status" >&5
++   echo "$as_me:18829: \$? = $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.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_rtti_exceptions=yes
+      fi
+@@ -19070,21 +19107,21 @@
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    # The option is referenced via a variable to avoid confusing sed.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:19078: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19115: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19082: \$? = $ac_status" >&5
++   echo "$as_me:19119: \$? = $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.
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+        lt_prog_compiler_pic_works_GCJ=yes
+      fi
+@@ -19174,21 +19211,21 @@
+    # Insert the option either (1) after the last *FLAGS variable, or
+    # (2) before a word containing "conftest.", or (3) at the end.
+    # Note that $ac_compile itself does not contain backslashes and begins
+    # with a dollar sign (not a hyphen), so the echo should work correctly.
+    lt_compile=`echo "$ac_compile" | $SED \
+    -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:19182: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19219: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:19186: \$? = $ac_status" >&5
++   echo "$as_me:19223: \$? = $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
+      # So say no if there are warnings
+      $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+        lt_cv_prog_compiler_c_o_GCJ=yes
+@@ -19438,22 +19475,23 @@
+ 	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+ 	if test $supports_anon_versioning = yes; then
+ 	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
+   cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ 	fi
+-      else
+-	ld_shlibs_GCJ=no
++        link_all_deplibs_GCJ=no
++        else
++	   ld_shlibs_GCJ=no
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+       else
+ 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
+       ;;
+@@ -20630,35 +20668,46 @@
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++
+ 
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+   # most powerpc-linux boxes support dynamic linking these days and
+   # people can always --disable-shared, the test was removed, and we
+   # assume the GNU/Linux dynamic linker is in use.
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-netbsd*)
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
++netbsd | netbsdelf*-gnu)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+@@ -22144,17 +22193,17 @@
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_NVTV 1
+ _ACEOF
+ 
+ 	fi
+ fi
+ 
+ 
+-XINE_REQS=1.1.7
++XINE_REQS=1.1.4
+ GST_MAJORMINOR=0.10
+ GST_REQS=0.10.12
+ GSTPLUG_REQS=0.10.12
+ 
+ # Check whether --enable-xine was given.
+ if test "${enable_xine+set}" = set; then
+   enableval=$enable_xine; case "${enableval}" in
+ 	yes) ENABLE_XINE=yes ;;
+@@ -22638,40 +22687,40 @@
+ { echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5
+ echo $ECHO_N "checking for EXTRA_GNOME... $ECHO_C" >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$EXTRA_GNOME_CFLAGS"; then
+         pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS  gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS launchpad-integration libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS  gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++  pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$EXTRA_GNOME_LIBS"; then
+         pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS  gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS launchpad-integration libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS  gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++  pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ 
+@@ -22680,35 +22729,35 @@
+ 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
+-	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+         else
+-	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EXTRA_GNOME_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+ 
+ $EXTRA_GNOME_PKG_ERRORS
+ 
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+ Alternatively, you may set the environment variables EXTRA_GNOME_CFLAGS
+ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+ 
+ $EXTRA_GNOME_PKG_ERRORS
+ 
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+ Alternatively, you may set the environment variables EXTRA_GNOME_CFLAGS
+ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.
+@@ -22752,40 +22801,40 @@
+ { echo "$as_me:$LINENO: checking for EXTRA_GNOME" >&5
+ echo $ECHO_N "checking for EXTRA_GNOME... $ECHO_C" >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$EXTRA_GNOME_CFLAGS"; then
+         pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++  pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$EXTRA_GNOME_LIBS"; then
+         pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++  pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ 
+@@ -22794,35 +22843,35 @@
+ 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
+-	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+         else
+-	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++	        EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EXTRA_GNOME_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+ 
+ $EXTRA_GNOME_PKG_ERRORS
+ 
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+ Alternatively, you may set the environment variables EXTRA_GNOME_CFLAGS
+ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+ 
+ $EXTRA_GNOME_PKG_ERRORS
+ 
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+ Alternatively, you may set the environment variables EXTRA_GNOME_CFLAGS
+ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.
+@@ -24464,25 +24513,31 @@
+ fi
+ 
+ 
+ 	GECKOS="xulrunner firefox mozilla-firefox seamonkey mozilla"
+ 	gecko=$with_gecko
+ 
+ 	if test -z "$with_gecko"; then
+ 				for g in $GECKOS; do
++			if $PKG_CONFIG --exists $g-plugin; then
++				gecko=$g
++				break;
++			fi
+ 			if $PKG_CONFIG --exists $g-xpcom; then
+ 				gecko=$g
+ 				break;
+ 			fi
+ 		done
+ 	elif ! $PKG_CONFIG --exists $gecko-xpcom; then
+-		{ { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5
++		if ! $PKG_CONFIG --exists $gecko-plugin; then
++			{ { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5
+ echo "$as_me: error: Gecko \"$gecko\" not found" >&2;}
+    { (exit 1); exit 1; }; }
++		fi
+ 	fi
+ 
+ 	if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then
+ 				{ echo "$as_me:$LINENO: WARNING: No gecko found, disabling plugin" >&5
+ echo "$as_me: WARNING: No gecko found, disabling plugin" >&2;}
+ 		enable_browser_plugins=no
+ 	elif test -z "$gecko"; then
+ 		{ { echo "$as_me:$LINENO: error: No gecko found" >&5
+@@ -24515,56 +24570,130 @@
+ 		PLUGIN_EXTRA_WARN_CXXFLAGS=
+ 	fi
+ 
+ fi
+ 
+ # Check for mozilla modules, but keep the CFLAGS and LIBS in
+ # separate vars
+ if test "$enable_browser_plugins" = "yes" ; then
++	if $PKG_CONFIG --exists $MOZILLA-plugin; then
++		MOZILLA_VERSION_MIN=1.9
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for MOZILLA_NOT_LINKED" >&5
++echo $ECHO_N "checking for MOZILLA_NOT_LINKED... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$MOZILLA_NOT_LINKED_CFLAGS"; then
++        pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul \$MOZILLA-plugin >= \$MOZILLA_VERSION_MIN\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$MOZILLA_NOT_LINKED_LIBS"; then
++        pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul \$MOZILLA-plugin >= \$MOZILLA_VERSION_MIN\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN" 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
++	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN"`
++        else
++	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5
++
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                enable_browser_plugins=no
++elif test $pkg_failed = untried; then
++	enable_browser_plugins=no
++else
++	MOZILLA_NOT_LINKED_CFLAGS=$pkg_cv_MOZILLA_NOT_LINKED_CFLAGS
++	MOZILLA_NOT_LINKED_LIBS=$pkg_cv_MOZILLA_NOT_LINKED_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	:
++fi
++ 	else
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for MOZILLA_NOT_LINKED" >&5
+ echo $ECHO_N "checking for MOZILLA_NOT_LINKED... $ECHO_C" >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$MOZILLA_NOT_LINKED_CFLAGS"; then
+         pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
+-		 \$MOZILLA-plugin\"") >&5
++			\$MOZILLA-plugin\"") >&5
+   ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin") 2>&5
++			$MOZILLA-plugin") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin" 2>/dev/null`
++			$MOZILLA-plugin" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$MOZILLA_NOT_LINKED_LIBS"; then
+         pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
+-		 \$MOZILLA-plugin\"") >&5
++			\$MOZILLA-plugin\"") >&5
+   ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin") 2>&5
++			$MOZILLA-plugin") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin" 2>/dev/null`
++			$MOZILLA-plugin" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ 
+@@ -24574,98 +24703,99 @@
+ 
+ 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
+ 	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin"`
++			$MOZILLA-plugin"`
+         else
+ 	        MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+-		 $MOZILLA-plugin"`
++			$MOZILLA-plugin"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5
+ 
+ 	{ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+                 enable_browser_plugins=no
+ elif test $pkg_failed = untried; then
+ 	enable_browser_plugins=no
+ else
+ 	MOZILLA_NOT_LINKED_CFLAGS=$pkg_cv_MOZILLA_NOT_LINKED_CFLAGS
+ 	MOZILLA_NOT_LINKED_LIBS=$pkg_cv_MOZILLA_NOT_LINKED_LIBS
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
++	fi
+ fi
+ # Check for other required modules, and merge CFLAGS, but not link
+ # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4
+ if test "$enable_browser_plugins" = "yes" ; then
+ 
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for BROWSER_PLUGIN" >&5
+ echo $ECHO_N "checking for BROWSER_PLUGIN... $ECHO_C" >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$BROWSER_PLUGIN_CFLAGS"; then
+         pkg_cv_BROWSER_PLUGIN_CFLAGS="$BROWSER_PLUGIN_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0
+-		 gnome-vfs-2.0 >= \$GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
++		gnome-vfs-2.0 >= \$GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
+   ($PKG_CONFIG --exists --print-errors "glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$BROWSER_PLUGIN_LIBS"; then
+         pkg_cv_BROWSER_PLUGIN_LIBS="$BROWSER_PLUGIN_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0
+-		 gnome-vfs-2.0 >= \$GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
++		gnome-vfs-2.0 >= \$GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
+   ($PKG_CONFIG --exists --print-errors "glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+   pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+     fi
+ else
+ 	pkg_failed=untried
+ fi
+ 
+@@ -24675,26 +24805,26 @@
+ 
+ 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
+ 	        BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
+         else
+ 	        BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0
+-		 gnome-vfs-2.0 >= $GNOMEVFS_REQS
+-		 gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+-		 gthread-2.0
+-		 totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
++		gnome-vfs-2.0 >= $GNOMEVFS_REQS
++		gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++		gthread-2.0
++		totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5
+ 
+ 	{ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+                 enable_browser_plugins=no
+ elif test $pkg_failed = untried; then
+@@ -24704,16 +24834,20 @@
+ 	BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
+         { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 	:
+ fi
+ 
+ 	BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS"
+ 
++	# for xul 1.9 we have to link anyway
++	if test "$MOZILLA_VERSION_MIN" = 1.9; then
++		BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS"
++	fi
+ 
+ 
+ 	# Earlier versions misdetect playlists
+ 	if test -n "$PKG_CONFIG" && \
+     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"shared-mime-info >= 0.22\"") >&5
+   ($PKG_CONFIG --exists --print-errors "shared-mime-info >= 0.22") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+@@ -24928,20 +25062,28 @@
+ 	if test "x$enable_browser_plugins" != "xyes" ; then
+ 		{ echo "$as_me:$LINENO: WARNING: libstartup-notification not found, necessary to build the plugin viewer" >&5
+ echo "$as_me: WARNING: libstartup-notification not found, necessary to build the plugin viewer" >&2;}
+ 	fi
+ fi
+ 
+ # Sets some variables, and check for xpidl
+ if test "$enable_browser_plugins" = "yes" ; then
+-	MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`"
+-	MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`"
+-	MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+-	MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++	if $PKG_CONFIG --exists $MOZILLA-plugin; then
++		MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++		MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin"
++		MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`"
++		MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`"
++	else
++		MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++		MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`"
++		MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++		MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`"
++	fi
++
+ 	MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}"
+ 
+ 	# Extract the first word of "xpidl", so it can be a program name with args.
+ set dummy xpidl; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+ if test "${ac_cv_path_MOZILLA_XPIDL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -25039,17 +25181,21 @@
+ 
+ 
+ 
+ 
+ fi
+ 
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
++		if $PKG_CONFIG --exists libxul; then
++		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++	else
+ 		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++	fi
+ 		if test "x$MOZILLA_IDLDIR" = "x"; then
+ 		MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
+ 	fi
+ 		if test "x$MOZILLA_IDLDIR" = "x"; then
+ 		MOZILLA_IDLDIR="$MOZILLA_INCLUDE_ROOT/idl"
+ 	fi
+ 
+ 
+@@ -25085,18 +25231,24 @@
+ 
+ 	__SAVE_CPPFLAGS=$CPPFLAGS
+ 	__SAVE_CXXFLAGS=$CXXFLAGS
+ 	__SAVE_LIBS=$LIBS
+ 	__SAVE_LDFLAGS=$LDFLAGS
+ 
+ 	CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
+ 	CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
+-	LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
+-	LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++	if test $MOZILLA_VERSION_MIN = 1.9; then
++		CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++		LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS"
++		LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++        else
++		LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
++		LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++	fi
+ 
+ 	{ echo "$as_me:$LINENO: checking for libxpcomglue_s" >&5
+ echo $ECHO_N "checking for libxpcomglue_s... $ECHO_C" >&6; }
+ 	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+@@ -25154,17 +25306,21 @@
+ 	ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 	if test "$have_libxpcomglue_s" = "yes"; then
+-		LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++		if test $MOZILLA_VERSION_MIN = 1.9; then
++			LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS"
++		else
++			LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++		fi
+ 	else
+ 		{ echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5
+ echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;}
+ 	fi
+ fi
+ 
+ 
+ 
+@@ -25244,17 +25400,17 @@
+ if test "$enable_browser_plugins" = "yes"; then
+ 	ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 	__SAVE_CPPFLAGS=$CPPFLAGS
+-	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom"
++	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
+ 
+ 
+ 
+ for ac_header in nsTArray.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+   { echo "$as_me:$LINENO: checking for $ac_header" >&5
--- totem-2.21.92.orig/debian/patches/99_bugzilla_fix_xine_backend.patch
+++ totem-2.21.92/debian/patches/99_bugzilla_fix_xine_backend.patch
@@ -0,0 +1,12 @@
+# http://bugzilla.gnome.org/show_bug.cgi?id=514391
+--- totem-2.21.92/src/backend/bacon-video-widget-xine.c~	2008-01-13 05:23:04.000000000 -0500
++++ totem-2.21.92/src/backend/bacon-video-widget-xine.c	2008-02-04 14:20:29.084635269 -0500
+@@ -1482,7 +1482,7 @@
+ 		if (g_utf8_validate (ui_data->str, -1, NULL) == FALSE) {
+ 			char *utf8;
+ 
+-			g_warning ("Metadata for updated title not in UTF-8 for mrl '%s'", type, bvw->com->mrl);
++			g_warning ("Metadata for updated title not in UTF-8 for mrl '%s'", event->type, bvw->com->mrl);
+ 			utf8 = g_locale_to_utf8 (ui_data->str, -1, NULL, NULL, NULL);
+ 			if (utf8 != NULL) {
+ 				data = g_new0 (signal_data, 1);
--- totem-2.21.92.orig/debian/patches/25_revert-xine-reqs-bump.patch
+++ totem-2.21.92/debian/patches/25_revert-xine-reqs-bump.patch
@@ -0,0 +1,13 @@
+Index: totem-2.20.0/configure.in
+===================================================================
+--- totem-2.20.0.orig/configure.in	2007-09-16 23:41:25.000000000 +0200
++++ totem-2.20.0/configure.in	2007-09-25 14:55:02.550812889 +0200
+@@ -82,7 +82,7 @@
+ 
+ dnl the two versions here implicate the gstreamer core and gst-plugins
+ dnl release versions.
+-XINE_REQS=1.1.7
++XINE_REQS=1.1.4
+ GST_MAJORMINOR=0.10
+ GST_REQS=0.10.12
+ GSTPLUG_REQS=0.10.12
--- totem-2.21.92.orig/debian/patches/04_desktop_gettext_domain.patch
+++ totem-2.21.92/debian/patches/04_desktop_gettext_domain.patch
@@ -0,0 +1,11 @@
+# Description: add translation domain
+# UbuntuSpecific: language pack change
+#
+diff -urNad totem-1.3.91~/data/totem.desktop.in.in.in totem-1.3.91/data/totem.desktop.in.in.in
+--- totem-1.3.91~/data/totem.desktop.in.in.in	2006-01-21 20:52:18.000000000 +0100
++++ totem-1.3.91/data/totem.desktop.in.in.in	2006-02-23 18:59:07.000000000 +0100
+@@ -12,3 +12,4 @@
+ X-GNOME-Bugzilla-Component=general
+ X-GNOME-Bugzilla-Version=@VERSION@
+ StartupNotify=true
++X-Ubuntu-Gettext-Domain=totem
--- totem-2.21.92.orig/debian/patches/series
+++ totem-2.21.92/debian/patches/series
@@ -0,0 +1,8 @@
+02_lpi.patch
+04_desktop_gettext_domain.patch
+05_auto_resize.patch
+20_use_alternatives.patch
+25_revert-xine-reqs-bump.patch
+30_totem_xulrunner19.patch
+70_autoconf.patch
+99_bugzilla_fix_xine_backend.patch
--- totem-2.21.92.orig/debian/patches/02_lpi.patch
+++ totem-2.21.92/debian/patches/02_lpi.patch
@@ -0,0 +1,49 @@
+# Description: launchpad integration changes
+# UbuntuSpecific: ubuntu launchpad integration
+#
+--- totem-2.21.92/configure.in	2008-02-04 18:19:22.000000000 +0000
++++ totem-2.21.92/configure.in.new	2008-02-04 19:36:38.000000000 +0000
+@@ -234,11 +234,11 @@
+ dnl Also check if we're going to be using GTK+ only
+ if test x$ENABLE_GTK = "xno" ; then
+ # FIXME: use gmodule-no-export instead!
+-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ 	HAVE_GNOME=yes
+ else
+ # FIXME: use gmodule-no-export instead!
+-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ 	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
+ 	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
+ 	HAVE_GNOME=no
+--- totem-2.21.92/data/totem.ui	2008-01-25 14:42:33.000000000 +0000
++++ totem-2.21.92/data/totem.ui.new	2008-02-04 19:43:20.000000000 +0000
+@@ -493,6 +493,9 @@
+          </menu>
+          <menu name="help" action="help-menu">
+             <menuitem name="contents" action="contents"/>
++            <separator/>
++            <placeholder name='LaunchpadItems'/>
++            <separator/>
+             <menuitem name="about" action="about"/>
+          </menu>
+       </menubar>
+--- totem-2.21.92/src/totem-menu.c	2008-02-04 16:32:03.000000000 +0000
++++ totem-2.21.92/src/totem-menu.c.new	2008-02-04 19:42:48.000000000 +0000
+@@ -26,6 +26,8 @@
+ #include <glib/gi18n.h>
+ #include <string.h>
+ 
++#include <launchpad-integration.h>
++
+ #include "totem-menu.h"
+ #include "totem.h"
+ #include "totem-interface.h"
+@@ -1331,5 +1333,6 @@
+ 	totem->languages_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+ 	totem->subtitles_action_group = NULL;
+ 	totem->subtitles_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
++         launchpad_integration_add_ui(totem->ui_manager, "ui/tmw-menubar/help/LaunchpadItems");
+ }
+ 
--- totem-2.21.92.orig/debian/patches/05_auto_resize.patch
+++ totem-2.21.92/debian/patches/05_auto_resize.patch
@@ -0,0 +1,15 @@
+# Description: set the auto_resize option
+# Ubuntu: http://bugs.launchpad.net/bugs/35055
+# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=334861
+diff -urNad totem-1.4.0~/data/totem.schemas.in totem-1.4.0/data/totem.schemas.in
+--- totem-1.4.0~/data/totem.schemas.in	2005-07-09 18:30:26.000000000 +0200
++++ totem-1.4.0/data/totem.schemas.in	2006-03-17 13:02:25.000000000 +0100
+@@ -75,7 +75,7 @@
+ 	<applyto>/apps/totem/auto_resize</applyto>
+ 	<owner>totem</owner>
+ 	<type>bool</type>
+-	<default>FALSE</default>
++	<default>true</default>
+ 	<locale name="C">
+ 	  <short>Resize the canvas automatically on file load</short>
+ 	</locale>
--- totem-2.21.92.orig/debian/totem-gstreamer.menu
+++ totem-2.21.92/debian/totem-gstreamer.menu
@@ -0,0 +1,6 @@
+?package(totem-gstreamer):\
+needs="X11"\
+section="Applications/Video"\
+title="totem (GStreamer)"\
+icon="/usr/share/pixmaps/totem.xpm"\
+command="/usr/bin/totem-gstreamer"
--- totem-2.21.92.orig/debian/totem-xine.prerm
+++ totem-2.21.92/debian/totem-xine.prerm
@@ -0,0 +1,14 @@
+#! /bin/sh
+set -e
+
+FLAVOUR=xine
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+    	update-alternatives --quiet --remove gnome-video-thumbnailer \
+		/usr/bin/totem-${FLAVOUR}-video-thumbnailer
+	update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR}
+fi
+
+#DEBHELPER#
+
+exit 0
--- totem-2.21.92.orig/debian/totem-xine.menu
+++ totem-2.21.92/debian/totem-xine.menu
@@ -0,0 +1,6 @@
+?package(totem-xine):\
+needs="X11"\
+section="Applications/Video"\
+title="totem (Xine)"\
+icon="/usr/share/pixmaps/totem.xpm"\
+command="/usr/bin/totem-xine"
--- totem-2.21.92.orig/debian/totem.install
+++ totem-2.21.92/debian/totem.install
@@ -0,0 +1 @@
+debian/bug/control /usr/share/bug/totem/
--- totem-2.21.92.orig/debian/totem-mozilla.links
+++ totem-2.21.92/debian/totem-mozilla.links
@@ -0,0 +1,13 @@
+/usr/lib/totem/default/libtotem-basic-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-basic-plugin.so
+/usr/lib/totem/default/libtotem-basic-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-basic-plugin.xpt
+/usr/lib/totem/default/libtotem-gmp-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-gmp-plugin.so
+/usr/lib/totem/default/libtotem-gmp-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-gmp-plugin.xpt
+/usr/lib/totem/default/libtotem-complex-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-complex-plugin.so
+/usr/lib/totem/default/libtotem-complex-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-complex-plugin.xpt
+/usr/lib/totem/default/libtotem-mully-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-mully-plugin.so
+/usr/lib/totem/default/libtotem-mully-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-mully-plugin.xpt
+/usr/lib/totem/default/libtotem-narrowspace-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-narrowspace-plugin.so
+/usr/lib/totem/default/libtotem-narrowspace-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-narrowspace-plugin.xpt
+/usr/lib/totem/default/libtotem-cone-plugin.so /usr/lib/xulrunner-addons/plugins/libtotem-cone-plugin.so
+/usr/lib/totem/default/libtotem-cone-plugin.xpt /usr/lib/xulrunner-addons/plugins/libtotem-cone-plugin.xpt
+
--- totem-2.21.92.orig/debian/control
+++ totem-2.21.92/debian/control
@@ -0,0 +1,222 @@
+Source: totem
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastien Bacher <seb128@debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
+Build-Depends: debhelper (>= 5),
+               quilt,
+               libgtk2.0-dev (>= 2.12.1),
+               libglib2.0-dev (>= 2.13.4),
+               libgnomeui-dev (>= 2.6.1.1-4),
+               libglade2-dev (>= 2.4.0),
+               libgnomevfs2-dev (>= 2.16.0),
+               libxine-dev (>= 1.1.4),
+               liblircclient-dev (>= 0.6.6),
+               libirman-dev (>= 0.4.2),
+               gnome-pkg-tools (>= 0.10),
+               scrollkeeper (>= 0.3.14-5),
+               libxml-parser-perl,
+               libgstreamer0.10-dev (>= 0.10.12),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.12),
+               gstreamer0.10-tools (>= 0.10.12),
+               gstreamer0.10-plugins-base (>= 0.10.12),
+               gstreamer0.10-plugins-good,
+               librsvg2-dev (>= 2.16.0-2),
+               librsvg2-common (>= 2.16.0-2),
+               libnautilus-extension-dev,
+               iso-codes,
+               libmusicbrainz4-dev (>= 2.1.1-4.1),
+               gnome-icon-theme (>= 2.15.90),
+               libdbus-glib-1-dev (>= 0.61),
+               xulrunner-1.9-dev,
+               intltool,
+               autotools-dev,
+               dpkg-dev (>= 1.13.19),
+               libgconf2-dev,
+               shared-mime-info (>= 0.22),
+               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+               libxtst-dev,
+               libgnome2-dev (>= 2.14.0),
+               libxrandr-dev (>= 1.1.1),
+               libxxf86vm-dev (>= 1.0.1),
+               libx11-dev,
+               gnome-doc-utils,
+               libgnome-settings-daemon-dev (>= 2.17.4),
+               python-dev (>= 2.3),
+               python-gobject-dev,
+               python-gtk2-dev (>= 2.12),
+               libbluetooth-dev,
+               liblaunchpad-integration-dev,
+               libgnome-keyring-dev,
+               libtrackerclient-dev,
+               libtotem-plparser-dev (>= 2.21.90),
+               libstartup-notification0-dev
+Standards-Version: 3.7.3
+
+Package: totem
+Architecture: all
+Depends: ${misc:Depends},
+         totem-plugins (>= ${source:Version}),
+         totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version})
+Description: A simple media player for the Gnome desktop (dummy package)
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This dummy package installs Totem with the GStreamer backend by
+ default.
+
+Package: totem-xine
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-icon-theme (>= 2.15.90),
+         iso-codes,
+         totem-common (>= ${gnome:Version}),
+         totem-common (<< ${gnome:NextVersion})
+Recommends: totem-mozilla (= ${source:Version}),
+            totem-plugins,
+            libxine1-ffmpeg
+Conflicts: totem (<< 0.99.12-2),
+           totem-mozilla (<< 2.20.0-3)
+Description: A simple media player for the Gnome desktop based on xine
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats. It features :
+ .
+    * Shoutcast, m3u, asx, SMIL and ra playlists support
+    * DVD (with menus), VCD and Digital CD (with CDDB) playback
+    * TV-Out configuration with optional resolution switching
+    * 4.0, 5.0, 5.1 and stereo audio output
+    * Full-screen mode (move your mouse and you get nice controls) with
+      Xinerama, dual-head and RandR support
+    * Aspect ratio toggling, scaling based on the video's original size
+    * Full keyboard control
+    * Simple playlist with repeat mode and saving feature
+    * Gnome and Nautilus integration
+    * Screenshot of the current movie
+    * Brightness and Contrast control
+    * Visualisation plugin when playing audio-only files
+    * Video thumbnailer for nautilus
+    * Nautilus properties page
+    * Works on remote displays
+    * DVD, VCD and OGG/OGM subtitles with automatic language selection
+    * Extensible with plugins
+ .
+  Author:   Bastien Nocera <hadess@hadess.net>
+  Homepage: http://www.hadess.net/totem.php3
+
+Package: totem-gstreamer
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gstreamer0.10-gnomevfs,
+         gstreamer0.10-plugins-base,
+         gstreamer0.10-alsa | gstreamer0.10-audiosink,
+         gstreamer0.10-plugins-good,
+         gstreamer0.10-x,
+         gnome-icon-theme (>= 2.15.90),
+         iso-codes,
+         totem-common (>= ${gnome:Version}),
+         totem-common (<< ${gnome:NextVersion})
+Conflicts: totem (<< 0.99.12-2),
+           gnome-control-center (<< 2.15.90),
+           totem-mozilla (<< 2.20.0-3)
+Recommends: totem-mozilla (= ${source:Version}),
+            totem-plugins,
+            gnome-control-center (>= 2.15.90)
+Suggests: gstreamer0.10-plugins-ugly,
+          gstreamer0.10-ffmpeg,
+          gnome-app-install          
+Description: A simple media player for the Gnome desktop based on gstreamer
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats. It features :
+ .
+    * Shoutcast, m3u, asx, SMIL and ra playlists support
+    * DVD (with menus), VCD and Digital CD (with CDDB) playback
+    * TV-Out configuration with optional resolution switching
+    * 4.0, 5.0, 5.1 and stereo audio output
+    * Full-screen mode (move your mouse and you get nice controls) with
+      Xinerama, dual-head and RandR support
+    * Aspect ratio toggling, scaling based on the video's original size
+    * Full keyboard control
+    * Simple playlist with repeat mode and saving feature
+    * Gnome, Nautilus and Gnome-vfs integration
+    * Screenshot of the current movie
+    * Brightness and Contrast control
+    * Visualisation plugin when playing audio-only files
+    * Video thumbnailer for nautilus
+    * Nautilus properties page
+    * Works on remote displays
+    * DVD, VCD and OGG/OGM subtitles with automatic language selection
+    * Extensible with plugins
+ .
+  Author:   Bastien Nocera <hadess@hadess.net>
+  Homepage: http://www.hadess.net/totem.php3
+
+Package: totem-mozilla
+Architecture: all
+Section: web
+Depends: ${misc:Depends},
+         totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}),
+         dbus (>= 0.61)
+Recommends: epiphany-browser | www-browser
+Replaces: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Provides: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Conflicts: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Description: Totem Mozilla plugin
+ This package contains the Totem Mozilla plugin, which will
+ enhance your Gecko-based browser to be able to display movie
+ clips.
+ .
+ This plugin should work for Firefox as well as XULRunner based browsers.
+
+Package: totem-common
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Description: Data files for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains common data files and translations.
+
+Package: totem-dbg
+Architecture: any
+Section: libs
+Priority: extra
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+         ${misc:Depends}
+Conflicts: libtotem-plparser1-dbg, libtotem-plparser10-dbg
+Description: Debugging symbols for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains detached debugging symbols.
+
+Package: totem-plugins
+Architecture: any
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: gromit, python-gdata
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Description: Plugins for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains a set of recommended plugins for Totem, which
+ allow to:
+ .
+    * Annotate the screen with the Gromit tool
+    * Control Totem with an Infrared remote control
+    * Control Totem with the keyboard's media player keys
+    * Keep the Totem window on top of the screen
+    * Display movie properties
+    * Deactivate the screensaver when a movie is playing
+    * Skip to a defined time in the movie
+    * Set the away status in the instant messenger when a movie is
+      playing
+    * Control totem with a mobile phone using the Bluetooth protocol
+ .
+ Additional plugins can be written in C, Python or Vala.
--- totem-2.21.92.orig/debian/totem-gstreamer.prerm
+++ totem-2.21.92/debian/totem-gstreamer.prerm
@@ -0,0 +1,14 @@
+#! /bin/sh
+set -e
+
+FLAVOUR=gstreamer
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+    	update-alternatives --quiet --remove gnome-video-thumbnailer \
+		/usr/bin/totem-${FLAVOUR}-video-thumbnailer
+	update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR}
+fi
+
+#DEBHELPER#
+
+exit 0
--- totem-2.21.92.orig/debian/rules
+++ totem-2.21.92/debian/rules
@@ -0,0 +1,181 @@
+#!/usr/bin/make -f
+#-*- makefile -*-
+
+#export DH_VERBOSE=1
+
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+STAMP_DIR := debian/stamp
+BUILD_DIR := debian/build
+PATCH_DIR := debian/patches
+
+COMPKG := totem-common
+PLUGPKG := totem-plugins
+
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+FLAVORS := xine gstreamer
+PRIORITY_xine := 35
+PRIORITY_gstreamer := 40
+export PRIORITY_xine PRIORITY_gstreamer
+
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+COMMON_CONFIGURE_FLAGS += \
+	--prefix=/usr \
+	--sysconfdir=/etc \
+	--mandir=\$${prefix}/share/man \
+	--disable-maintainer-mode \
+	--with-gecko=mozilla \
+	--disable-run-in-source-tree \
+	--disable-scrollkeeper
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+        COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
+else
+        COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+xine_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \
+	--libexecdir=\$${prefix}/lib/totem/xine \
+	--enable-xine
+
+gstreamer_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \
+	--libexecdir=\$${prefix}/lib/totem/gstreamer
+
+patch: $(STAMP_DIR)/patch-stamp
+$(STAMP_DIR)/patch-stamp:
+	dh_testdir
+	mkdir -p $(STAMP_DIR)
+	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+	touch $@
+
+builddir = $(BUILD_DIR)/$*
+
+configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
+$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
+	dh_testdir
+	mkdir -p $(builddir)
+	cd $(builddir) && \
+		CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_CONFIGURE_FLAGS)
+	touch $@
+
+build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
+	dh_testdir
+	$(MAKE) -C $(builddir)
+	touch $@
+
+installdir = $(CURDIR)/debian/totem-$*
+
+install-clean:
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+install-%: $(STAMP_DIR)/build-stamp-%
+	GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+		$(MAKE) -C $(builddir) install DESTDIR=$(installdir)
+	cd $(installdir)/usr/bin && for i in totem*; do \
+		mv $$i totem-$*$${i#totem} ; done
+	cd $(installdir)/$$(pkg-config libnautilus-extension --variable=extensiondir) && \
+		mv libtotem-properties-page.so libtotem-properties-page.so.$*
+	# hide the mozilla plugin in a specific directory
+	cd $(installdir)/usr/lib/mozilla/plugins && \
+		mv *.so *.xpt $(installdir)/usr/lib/totem/$*/
+	# drop anything else
+	rm -rf $(installdir)/usr/lib/xulrunner
+	# drop *.a and *.la files
+	find debian/totem-$*/usr/lib -mindepth 2 -name '*.a' -exec rm {} \;
+	find debian/totem-$*/usr/lib -name '*.la' -exec rm {} \;
+	echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/totem-$*.substvars
+	echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/totem-$*.substvars
+
+install: install-clean $(addprefix install-, $(FLAVORS))
+	dh_installdirs
+	mkdir -p debian/$(COMPKG)/usr
+	mv debian/totem-gstreamer/etc debian/$(COMPKG)/
+	mv debian/totem-gstreamer/usr/share debian/$(COMPKG)/usr/
+	mkdir -p debian/$(PLUGPKG)/usr/lib/totem
+	mv debian/totem-gstreamer/usr/lib/totem/plugins debian/$(PLUGPKG)/usr/lib/totem/
+	find debian/$(PLUGPKG) -name '*.py[co]' -delete
+	cd debian/totem-xine && rm -rf etc usr/share usr/lib/pkgconfig \
+		usr/include usr/lib/*.so* usr/lib/*.a usr/lib/totem/plugins
+# Make both totems installable together
+	for f in $(FLAVORS); do \
+		F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
+		mkdir -p debian/totem-$$f/usr/share/applications ; \
+		( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
+			debian/$(COMPKG)/usr/share/applications/totem.desktop \
+			| sed -r "s,^(Exec=.*totem),\1-$$f," \
+			| grep -v ^MimeType ; \
+			echo NoDisplay=true ) \
+		> debian/totem-$$f/usr/share/applications/totem-$$f.desktop ; \
+		sed -e"s/@FLAVOUR@/$$f/" \
+		    -e"s/@PRIORITY@/$$(eval echo \$$PRIORITY_$$f)/" \
+		    -e"s,@NAUTILUS_EXTDIR@,$$(pkg-config libnautilus-extension --variable=extensiondir)," \
+		< debian/totem-flavor.postinst.in \
+		> debian/totem-$${f}.postinst ; \
+	done
+	printf "\nTryExec=/usr/bin/totem" >> debian/$(COMPKG)/usr/share/applications/totem.desktop
+	dh_install
+
+clean::
+	dh_testdir
+	dh_testroot
+	QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+	rm -f $(foreach f,$(FLAVORS),debian/totem-$(f).postinst)
+	rm -rf .pc
+	rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
+	-test -r /usr/share/misc/config.sub && test -r config.sub && \
+		cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && test -r config.guess && \
+		cp -f /usr/share/misc/config.guess config.guess
+	dh_clean
+
+binary: binary-arch binary-indep
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i -A NEWS README
+	dh_installchangelogs -i ChangeLog
+	dh_installman -i
+	dh_scrollkeeper -i
+	dh_gconf -i
+	dh_desktop -i
+	dh_compress -i
+	dh_link -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a -A NEWS README
+	dh_installmenu -a
+	dh_installchangelogs -a ChangeLog
+	dh_desktop -a
+	dh_icons -a
+	dh_compress -a
+	dh_link -a
+	dh_fixperms -a
+	dh_strip -a --dbg-package=totem-dbg
+	dh_shlibdeps
+	dh_perl -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary
--- totem-2.21.92.orig/debian/totem-flavor.postinst.in
+++ totem-2.21.92/debian/totem-flavor.postinst.in
@@ -0,0 +1,24 @@
+#! /bin/sh
+set -e
+
+FLAVOUR=@FLAVOUR@
+PRIORITY=@PRIORITY@
+NAUTILUS_EXTDIR=@NAUTILUS_EXTDIR@
+
+if [ "$1" = configure ]; then
+	update-alternatives --quiet --install \
+		/usr/bin/gnome-video-thumbnailer gnome-video-thumbnailer \
+		/usr/bin/totem-${FLAVOUR}-video-thumbnailer ${PRIORITY}
+	update-alternatives --quiet --install \
+		/usr/bin/totem totem /usr/bin/totem-${FLAVOUR} ${PRIORITY} \
+		--slave /usr/bin/totem-video-indexer totem-video-indexer \
+			/usr/bin/totem-${FLAVOUR}-video-indexer \
+		--slave ${NAUTILUS_EXTDIR}/libtotem-properties-page.so \
+			libtotem-properties-page.so \
+			${NAUTILUS_EXTDIR}/libtotem-properties-page.so.${FLAVOUR} \
+		--slave /usr/lib/totem/default totem-default.dir /usr/lib/totem/${FLAVOUR}
+fi
+
+#DEBHELPER#
+
+exit 0
--- totem-2.21.92.orig/debian/changelog
+++ totem-2.21.92/debian/changelog
@@ -0,0 +1,1277 @@
+totem (2.21.92-0ubuntu2) hardy; urgency=low
+
+  * use --with-gecko=mozilla to use xulrunner-1.9
+    - update debian/rules
+  * update build-depends use xulrunner-1.9-dev instead of firefox-dev
+    - update debian/control{.in}
+  * add xulrunner 1.9 support patches
+    - add debian/patches/30_totem_xulrunner19.patch
+    - update debian/patches/series
+    - refresh debian/patches/70_autoconf.patch
+  * link plugin libs to /usr/lib/xulrunner-addons/plugins to support 1.9 and
+    drop support for all 1.8 geckos
+    - update debian/totem-mozilla.links
+  * drop midbrowser links until it switches to xulrunner 1.9
+
+ -- Alexander Sack <asac@ubuntu.com>  Wed, 06 Feb 2008 18:16:57 +0100
+
+totem (2.21.92-0ubuntu1) hardy; urgency=low
+
+  [ Pedro Fragoso ]
+  * New upstream release (LP: #189136)
+    - Update the tracker plugin UI
+    - Fix compilation with newer versions of Vala
+    - Support both the old and the new gnome-settings-daemon APIs for
+      multimedia keys
+    - Small bug and build fixes
+    - Add support for the new x-content/ type, to show in the nautilus'
+      media selection
+    - Lock the screensaver when only audio is playing, but allow the users
+      to disable that behaviour, for monitor-powered speakers
+    - Add a thumbnail plugin to use the video's thumbnail as the window icon
+    - Remove unneeded gnome-desktop and HAL dependency
+    - Don't start up gnome-settings-daemon when it's not already running
+    - Forcefully exit after 10 seconds when we can't finish the shutdown
+    - Don't change the resolution of screens on multi-head setups
+    - xine-lib:
+      + Check metadata being in UTF-8 before passing it to the player
+    - GStreamer:
+      + Fix a few crashers by not using GConf in the streaming thread
+    - Browser plugin:
+      + Fix building the GTK+ version
+  * debian/control{.in}:
+    - Removed b-d libgnome-desktop-dev (>= 2.6.1-2), libhal-dev (>= 0.5)
+    - B-d on libstartup-notification0-dev
+  * debian/patches/
+    - 02_lpi: Updated
+    - 70_autoreconf: Updated
+    - 99_bugzilla_fix_xine_backend.patch: Added to fix FTBFS
+  * debian/totem-mozilla.install:
+    - Added symlinks for midbrowser (LP: #189382), Thanks Steve Magoun
+
+  [ Alexander Sack ]
+  * add dh_shlibdeps to binary-arch
+    - debian/rules: Updated
+  
+ -- Pedro Fragoso <emberez@gmail.com>  Mon, 04 Feb 2008 19:11:25 +0000
+
+totem (2.21.90-0ubuntu3) hardy; urgency=low
+
+  * Auto-generate totem-{xine,gstreamer}.postinst from new
+    debian/totem-flavor.postinst.in in the install target
+  * Substitute the pkg-config variable into the generated postinst also,
+    so that the update-alternatives slave for the nautilus extension is
+    kept in sync with the ABI.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 24 Jan 2008 15:59:50 +0000
+
+totem (2.21.90-0ubuntu2) hardy; urgency=low
+
+  * Use pkg-config to detect the nautilus extension directory instead of 
+    hard-coding the name, fixing a build failure caused by the switch to
+    the 2.0 extension ABI.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 23 Jan 2008 16:24:12 +0000
+
+totem (2.21.90-0ubuntu1) hardy; urgency=low
+
+  * New upstream release (LP: #183653)
+    - Fix GTK+-only build wrt. the tracker plugin and the startup-notification
+    - Fix building with newer versions of Vala
+    - Make the icon bigger when the launcher is dropped on the desktop
+    - Ignore backup files when adding them to the playlist
+    - Only put Totem on top when playing audio
+    - Install the Nautilus extension in the correct directory
+    - Browser plugin:
+      - Reduce the number of times the button glows in the browser plugin
+      - Handle application/x-ogg mimetype
+  * debian/control{.in}; 
+    - Build depend on libtotem-plparser-dev >= 2.21.90 and libcamel1.2-dev
+    - Bump Standars-Version to 3.7.3  
+  * debian/patches/02_lpi: updated
+  * debian/patches/70_autoconf: updated
+
+ -- Pedro Fragoso <emberez@gmail.com>  Mon, 07 Jan 2008 21:31:26 +0000
+
+totem (2.21.5-0ubuntu2) hardy; urgency=low
+
+  * debian/rules: Fix bashism ("echo -e" => "printf")
+    (LP: #177459)
+
+ -- dAniel hAhler <ubuntu@thequod.de>  Wed, 19 Dec 2007 14:50:17 +0100
+
+totem (2.21.5-0ubuntu1) hardy; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - Build depend on libtotem-plparser-dev >= 2.21.4
+    - Do not build libtotem-plparser{10,-dev} binary packages anymore.
+  * debian/rules:
+    - Remove instalation of files for totem-plparser
+  * debian/patches/02_lpi.patch:
+    - Updated so it applies.
+  * debian/patches/30_kfreebsd_gnu.patch:
+    - Removed, as it applies to plparser which has been splitted.
+  * debian/patches/70_autoconf.patch:
+    - Regenerated.
+
+ -- Emilio Pozuelo Monfort <pochu@ubuntu.com>  Sat, 08 Dec 2007 19:29:01 +0100
+
+totem (2.21.3-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - Add a sharing plugin using libepc
+    - Add a Tracker-based video search plugin
+    - Add the ability to select text subtitles for files in the UI
+    - Port the mythtv plugin to using the TotemVideoList
+    - Show a busy cursor when loading tracks from the YouTube plugin
+    - Restore the previously active sidebar page when restarting Totem
+    - Add the --no-existing-session argument to allow launching multiple
+      instances of the Movie Player
+    - Browser plugin:
+      - Add support for compiling with xulrunner
+      - Skip 0-length streams in playlists
+    - GStreamer backend:
+      - Add graphviz support
+  * debian/control.in:
+    - Build-Depends on libtrackerclient-dev
+    - totem-plugins Suggests python-gdata (LP: #173046)
+  * debian/patches/series:
+    - list Ubuntu patches (LP: #172463)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 03 Dec 2007 11:15:17 +0100
+
+totem (2.21.2-0ubuntu2) hardy; urgency=low
+
+  * debian/totem-mozilla.links:
+    - create links for the new cone plugin so it's correctly listed
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 27 Nov 2007 19:36:32 +0100
+
+totem (2.21.2-0ubuntu1) hardy; urgency=low
+
+  * Sync with Debian
+  * debian/control.in:
+    - Build-Depends on liblaunchpad-integration-dev, firefox-dev, 
+      libgnome-keyring-dev
+    - don't Build-Depends on libxul-dev, xulrunner, 
+      libvala-dev, valac, libgalago-dev
+    - rename due to soname change 
+    - totem-mozilla Replaces, Provides, Conflicts with 
+      totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin 
+    - ubuntu uses firefox and not iceweasel
+    - updated maintainer information
+    - updated pygtk requirement
+    - use Replaces where those are required
+    - use Suggests instead of Recommends for gstreamer0.10-plugins-ugly, 
+      gstreamer0.10-ffmpeg since those packages come from universe
+    - totem-gstreamer Suggests gnome-app-install
+  * debian/patches/02_lpi.patch:
+    - launchpad-integration
+  * debian/patches/03_autoconf.patch:
+    - configure update
+  * debian/patches/04_desktop_gettext_domain.patch:
+    - Add gettext domain to .desktop file to get language pack support.
+  * debian/patches/05_auto_resize.patch:
+    - use auto resize as default behaviour
+  * debian/patches/70_autoconf.patch:
+    - updated
+  * debian/rules:
+    - build with firefox instead of xulrunner
+    - call dh_icons
+    - don't build using the vala option
+    - remove bytecompiled files
+    - update for the soname change
+  * debian/totem-mozilla.links:
+    - use firefox and not iceweasel
+
+ -- Sebastien Bacher <seb128@canonical.com>  Mon, 26 Nov 2007 15:28:50 +0100
+
+totem (2.20.1-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Cleanup whitespace.
+
+  [ Josselin Mouette ]
+  * totem depends on totem-plugins. Closes: #445675.
+  * Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554.
+  * debian/bug/control: ship a bug control file in totem to correctly
+    report dependencies of totem-{gstreamer,xine}.
+
+  [ Sebastian Dröge ]
+  * New upstream bugfix release:
+    + debian/control:
+      - Build depend on Gtk >= 2.12.1 as per configure.in.
+    + debian/patches/60_gnome-doc-utils.patch:
+      - Dropped, upstream uses new enough gnome-doc-utils now.
+    + debian/patches/70_autoconf.patch:
+      - Regenerated for the new version.
+
+ -- Josselin Mouette <joss@debian.org>  Sun, 25 Nov 2007 13:15:19 +0100
+
+totem (2.20.0-3) unstable; urgency=low
+
+  * Complete rework of debian/rules.
+  * Split data files in totem-common.
+  * Make totem-xine and totem-gstreamer installable together.
+    Closes: #402549.
+  * Move debugging symbols to totem-dbg.
+  * Move plugins to totem-plugins.
+  * Switch to quilt.
+  * Refresh patches.
+  * Fix menu files and ship them in both packages.
+  * 60_gnome-doc-utils.patch: regenerate help/Makefile.in with a newer
+    gnome-doc-utils.make that supports out-of-tree builds.
+  * Build-depend on libbluetooth-dev and libgalago-dev for the
+    corresponding plugins.
+  * Remove symbolic links in the firefox directory.
+  * Improve long package descriptions.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 26 Sep 2007 22:36:06 +0200
+
+totem (2.20.0-2) unstable; urgency=low
+
+  [ Sebastian Dröge ]
+  * Upload to unstable.
+  * debian/control.in:
+    + Remove duplicated liblircclient-dev build dependency.
+
+  [ Josselin Mouette ]
+  * libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 26 Sep 2007 00:41:46 +0200
+
+totem (2.20.0-1) experimental; urgency=low
+
+  * New upstream stable release:
+    + debian/control.in:
+      - Bump required versions of Gtk, GLib, GnomeVFS, GStreamer,
+        shared-mime-info.
+      - Build depend on vala.
+      - Build depend on python-gobject-dev and python-gtk2-dev.
+      - Build depend on libgnome-settings-daemon-dev.
+      - Build depend on liblircclient-dev.
+      - Bump soname of libtotem-plparser.
+    + debian/rules:
+      - Enable the vala bindings support.
+
+ -- Sebastian Dröge <slomo@debian.org>  Mon, 17 Sep 2007 07:12:48 +0200
+
+totem (2.18.2-2) unstable; urgency=high
+
+  * Depend on iso-codes; thanks Jan Alonzo.
+  * Recommend libxine1-ffmpeg; closes: #433166.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 22 Jul 2007 15:06:24 +0200
+
+totem (2.18.2-1) unstable; urgency=low
+
+  [ Loic Minier ]
+  * Honor CFLAGS we set in rules, doh!
+
+  [ Sven Arvidsson ]
+  * New patch, lirc_freeconfig, from upstream SVN, fix freeze on close
+    with lirc; thanks Philip Withnall (GNOME bug #427681);
+    (Closes: #418020)
+
+  [ Loic Minier ]
+  * Excluse /usr/lib/totem/ and /usr/lib/nautilus/extensions- for
+    dh_makeshlibs as there are plugins in these dirs.
+  * Upload to unstable; drop check-dist include.
+  * New upstream stable release.
+    - New patch, 25_revert-xine-reqs, reverts the bump in Xine requirements
+      which was only added to pull a Xine bugfix.
+    - New patch, 70_autoconf, run autoconf.
+    - Drop patch 40_lirc_freeconfig, merged upstream.
+  * Wrap build-deps and deps.
+  * Fix some ${binary:Version} uses in Arch: all packages.
+  * Sprinkle some ${misc:Depends}.
+  * Bump up Debhelper compatibility level to 5.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 01 Jun 2007 15:36:12 +0200
+
+totem (2.18.1-1) experimental; urgency=low
+
+  * Include the new check-dist Makefile to prevent accidental uploads to
+    unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+  * New upstreeam release; no API change.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 04 Apr 2007 17:26:55 +0200
+
+totem (2.18.0-1) experimental; urgency=low
+
+  * New upstream major stable release; with API additions.
+    - Pass --enable-xine to the Xine configure and drop the --enable-gstreamer
+      from the gstreamer configure.
+    - Prefer totem-gstreamer over totem-xine in the dependencies of totem.
+    - Bump up shlibs to >= 2.17.5.
+    - Configure with --disable-run-in-source-tree; change --enable-mozilla
+      --with-browser-plugins=xulrunner into --with-gecko=xulrunner.
+    - Bump up build-deps and existing deps to libglib2.0-dev >= 2.12.0,
+      libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.9.92, gnome-icon-theme >=
+      2.15.90, libdbus-glib-1-dev >= 0.61, dbus >= 0.61, libxine-dev >= 1.1.4,
+      libgstreamer0.10-dev >= 0.10.6, libgstreamer-plugins-base0.10-dev >=
+      0.10.7.
+    - Add a build-dep on libgnome2-dev >= 2.14.0.
+    - Add deps on gnome-icon-theme >= 2.15.90.
+    - Build-depend on gnome-doc-utils.
+  * Configure with --disable-scrollkeeper.
+  * Drop INSTALL_PROGRAM, dh_strip handles this.
+  * Cleanups.
+  * Let totem-gstreamer recommend gnome-control-center >= 2.15.90 for
+    gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as
+    the bundled gnome-sound-properties is not aware of GStreamer profiles.
+  * Add a totem-gstreamer.README.Debian to document setting the output sink.
+  * Build-depend on librsvg2-dev and librsvg2-common >= 2.16.0-2 to make the
+    package autobuildable.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 23 Mar 2007 11:53:24 +0100
+
+totem (2.16.6-1) unstable; urgency=medium
+
+  * New upstream stable release; bug fixes and translations.
+    - Drop patch 30_dlopen_noremove_dbus_glib, merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 19 Mar 2007 15:33:08 +0100
+
+totem (2.16.5-3) unstable; urgency=medium
+
+  [ Sebastien Bacher ]
+  * debian/patches/30_dlopen_noremove_dbus_glib.dpatch:
+    - fix "crash because NPPVpluginKeepLibraryInMemory is broken in gecko",
+      patch from Alexander Sack (GNOME bug #415389)
+
+  [ Loic Minier ]
+  * Urgency medium.
+
+ -- Loic Minier <lool@dooz.org>  Thu,  8 Mar 2007 14:51:55 +0100
+
+totem (2.16.5-2) unstable; urgency=low
+
+  * Upload to unstable; drop dist-check.
+
+ -- Loic Minier <lool@dooz.org>  Sat,  3 Feb 2007 14:58:22 +0100
+
+totem (2.16.5-1) experimental; urgency=low
+
+  * New upstream stable release; bug fixes and translation updates; no API or
+    ABI change.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 29 Jan 2007 17:55:00 +0100
+
+totem (2.16.4-3) UNRELEASED; urgency=low
+
+  [ Sven Arvidsson ]
+  * Add upstream ChangeLog, NEWS and README. (Closes: #404362)
+  * Remove unnecessary upstream TODO.
+
+  [ Loic Minier ]
+  * Add a get-orig-source target to retrieve the upstream tarball.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 13 Jan 2007 22:51:13 +0100
+
+totem (2.16.4-2) unstable; urgency=low
+
+  * Build-depend on libxtst-dev, thanks Sven Arvidsson
+    (closes: #315926).
+
+ -- Josselin Mouette <joss@debian.org>  Thu, 30 Nov 2006 14:16:44 +0100
+
+totem (2.16.4-1) unstable; urgency=low
+
+  * New upstream stable release; no API change; fixes for session saving (now
+    correctly restored, closes: #399983, and with support for the width of the
+    sidebar), some translation cleanups.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 29 Nov 2006 21:41:02 +0100
+
+totem (2.16.3-3) unstable; urgency=high
+
+  * Add symlinks in the iceweasel plugins directory; symlinks for the firefox
+    plugins dir are still installed for compatibility with local firefox debs
+    and backwards-compatibility.
+  * Update description to mention Iceweasel instead of Firefox.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 21 Nov 2006 17:31:59 +0100
+
+totem (2.16.3-2) unstable; urgency=low
+
+  * Do not build-depend on libhal-dev for kfreebsd-i386 and kfreebsd-amd64;
+    build-depend on libcam-dev instead; thanks Petr Salinger; closes: #399091.
+  * Drop useless libnautilus-burn-dev build-dep; thanks Bastien Nocera.
+
+ -- Loic Minier <lool@dooz.org>  Sat, 18 Nov 2006 10:03:47 +0100
+
+totem (2.16.3-1) unstable; urgency=low
+
+  * New upstream release; no API change.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 14 Nov 2006 17:38:27 +0100
+
+totem (2.16.2-4) unstable; urgency=low
+
+  * GNU/kFreeBSD support thanks Aurelien Jarno; closes: #391307.
+    - New dpatch, 30_kfreebsd_gnu, to use sys/cdio.h and sys/disklabel.h under
+      FreeBSD and mntent.h under Linux.
+  * Update 30_kfreebsd_gnu dpatch for totem 2.16.2.
+
+ -- Loic Minier <lool@dooz.org>  Mon,  6 Nov 2006 18:24:35 +0100
+
+totem (2.16.2-3) unstable; urgency=low
+
+  * Fix copyright to mention the LGPL for the Totem Playlist parser library,
+    "plparser", and the excemption for proprietary GStreamer plugins; thanks
+    Thadeu Lima de Souza Cascardo; closes: #396549.
+
+ -- Loic Minier <lool@dooz.org>  Wed,  1 Nov 2006 15:43:30 +0100
+
+totem (2.16.2-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 19 Oct 2006 11:57:54 +0200
+
+totem (2.16.2-1) experimental; urgency=low
+
+  * New upstream release; no API change.
+
+ -- Loic Minier <lool@dooz.org>  Mon,  2 Oct 2006 15:52:01 +0200
+
+totem (2.16.1-1) experimental; urgency=low
+
+  [ Guilherme de S. Pastore ]
+  * New upstream release.
+  * debian/watch: updated.
+
+  [ Loic Minier ]
+  * Add debian/test.html, sample javascript integration of the gecko plugin.
+  * Re-add Firefox symlinks as these are required after all.
+  * New upstream release; with API additions.
+    - Bump libtotem-plaparser1 shlibs to >= 2.16.1.
+    - Install new plugin flavor, MullY.
+
+ -- Loic Minier <lool@dooz.org>  Fri,  8 Sep 2006 09:14:19 +0200
+
+totem (1.5.92-1) experimental; urgency=low
+
+  * Fix changelog of 1.5.91-1; hal 0.6 is not released yet, but upstream has a
+    safety check just in case it would break API/ABI.
+  * New upstream development release.
+    - Drop 10_dont-clean-totem-schemas-in dpatch, merged upstream.
+
+ -- Loic Minier <lool@dooz.org>  Fri, 25 Aug 2006 22:04:46 +0200
+
+totem (1.5.91-2) experimental; urgency=low
+
+  * Bump shlibs to libtotem-plparser1 >= 1.5.1.
+  * Pass "-L libtotem-plparser1" and  "-l debian/libtotem-plparser1/usr/lib"
+    to dh_shlibdeps for the other packages to see the lib and use the shlibs.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 13 Aug 2006 15:19:01 +0200
+
+totem (1.5.91-1) experimental; urgency=low
+
+  * New upstream development releases; with API additions.
+    - Target at experimental.
+    - Bump up libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev
+      build-deps to >= 0.10.1.
+    - Bump up libglib2.0-dev build-dep to >= 2.8.0.
+    - Bump up libxine-dev build-dep to >= 1.1.2.
+    - Add a build-dep on libgconf2-dev.
+    - Rename --with-mozilla configure flag to --with-browser-plugins.
+    - Add a build-dep on shared-mime-info (>= 0.17).
+    - Add a build-dep on libhal-dev (>= 0.5).
+    - Drop 09_maintainer-mode dpatch as upstream now calls
+      GNOME_MAINTAINER_MODE_DEFINES which requires AM_MAINTAINER_MODE.
+    - Drop 60_mandatory-relibtoolizing dpatch which isn't required anymore.
+    - Update symlinks and installation steps for the split in 4 distinct
+      plugins.
+    - New dpatch, 10_dont-clean-totem-schemas-in, to workaround an upstream
+      bug preventing two successive builds.
+    - Fixes playing of streams with mms:// URL lists. (Closes: #382603)
+  * Ship the *.xpt files as recommended by upstream.
+  * Only symlink the plugin in /usr/lib/mozilla as Firefox and XULRunner are
+    expected to look there too.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 13 Aug 2006 14:28:00 +0200
+
+totem (1.4.5-1) unstable; urgency=low
+
+  * New upstream release; no API changes.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 12 Sep 2006 10:41:57 +0200
+
+totem (1.4.4-1) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * Make the package binNMU-able by making the arch-all packages depend
+    only on >= ${Source-Version} arch-any packages.
+  * Make totem-mozilla depend on dbus.
+
+  [ Loic Minier ]
+  * Use ${source:Version} and ${binary:Version} because of the totem-mozilla
+    Recommend; build-depend on dpkg-dev >= 1.13.19.
+  * Let totem-xine also Recommend totem-mozilla.
+  * New upstream release.
+    - Drop the 11_configure-drop-mozilla-link-flags dpatch, merged upstream.
+    - Update 60_mandatory-relibtoolizing dpatch.
+    - Fix the moves of the mozilla plugin since upstream now installs in
+      /usr/lib/mozilla/plugins, whatever the gecko engine.
+
+ -- Loic Minier <lool@dooz.org>  Tue,  8 Aug 2006 14:13:44 +0200
+
+totem (1.4.3-1) unstable; urgency=low
+
+  * Fix bashishm in mv "foo.{x,y}" snippet executed by $SHELL, thanks Julien
+    Danjou. (Closes: #377367)
+  * Drop 10_configure-force-xulrunner dpatch as --with-mozilla=xulrunner is
+    enough to select the appropriate Gecko.
+  * New upstream release.
+    - Update 60_mandatory-relibtoolizing dpatch.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 13 Jul 2006 13:42:08 +0200
+
+totem (1.4.2-1) experimental; urgency=low
+
+  * Upload to experimental for now as the package is frozen in unstable due to
+    a big transition, but some users requested the fixed package.
+  * Set libtotem-plparser1-dbg Priority to extra.
+    [debian/control, debian/control.in]
+  * New dpatch, 09_maintainer-mode, to use AM_MAINTAINER_MODE for safety.
+  * Update 60_mandatory-relibtoolizing dpatch to also intltoolize as this is
+    required with intltool 0.35. (Closes: #372529)
+  * Bump up Standards-Version to 3.7.2.
+  * New upstream release.
+    - Lower libgnomevfs2-dev build-dep to >= 2.8.2
+    - Bump up gstreamer0.10-plugins-base build-dep to >= 0.10.7.
+    - Drop 30_totem-mozilla-types dpatch, merged upstream.
+    - Update 60_mandatory-relibtoolizing dpatch.
+  * Build-depend on autotools-dev for the config.guess / config.sub update
+    snippet to work.
+
+ -- Loic Minier <lool@dooz.org>  Sat,  8 Jul 2006 21:34:16 +0200
+
+totem (1.4.1-2) unstable; urgency=low
+
+  * debian/patches/30_totem-mozilla-types.dpatch
+    - Added. Correct the Bool types used by the totem-mozilla plugin. Fixes the
+      mozilla plugin on big-endian architectures.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun,  4 Jun 2006 22:16:38 +0200
+
+totem (1.4.1-1) unstable; urgency=low
+
+  [ Guilherme de S. Pastore ]
+  * New upstream release.
+  * debian/patches:
+    - 00list: updated.
+    - 06_volume_icons_change.dpatch, 07_no_mms_to_mmsh_change.dpatch,
+      08_aspect_ratio_fix.dpatch,
+      09_play_protocol_not_listed_by_firefox.dpatch: removed, applied upstream.
+
+  [ Loic Minier ]
+  * Update the mandatory relibtoolizing patch...
+    [debian/patches/60_mandatory-relibtoolizing.dpatch]
+  * Move common configure flags to COMMON_CONFIGURE_FLAGS and add
+    --disable-maintainer-mode to them.
+    [debian/rules]
+  * Recommend totem-mozilla and not totem-gstreamer-xul-plugin.
+    [debian/control, debian/control.in]
+  * Promote gstreamer0.10-plugins-ugly and gstreamer0.10-ffmpeg from Suggests
+    to Recommends.
+    [debian/control, debian/control.in]
+  * Remove what looks useless and now bogus deps on xlibs. (Closes: #370089)
+    [debian/control, debian/control.in]
+
+ -- Loic Minier <lool@dooz.org>  Thu, 25 May 2006 21:09:34 +0200
+
+totem (1.4.0-1) unstable; urgency=low
+
+  [ Gustavo Franco ]
+  * New upstream release.
+  * debian/control:
+    - intltool added in build-depends field
+    - libnautilus-burn-dev build-depends downgraded
+    - libtotem-plparser1 added, dropping libtotem-plparser0 (due to
+      SONAME change)
+    - gstreamer0.8 related dependencies bumped up to gstreamer0.10
+    - Uploaders field sync with gnome-pkg-tools
+    - Standards-Version bumped up to 3.7.0
+  * debian/rules:
+    - minor changes to fix the build (e.g: libtotem-plparser1 bits)
+    - fix '*.la' removal from all the binaries
+    - config.{guess,sub} unneeded copy removed from clean target
+  * debian/patches/01_totem_playlist_add_fix.dpatch dropped (merged upstream)
+  * debian/patches/08_firefox-plugin-fix.dpatch dropped (merged upstream)
+  * Patches merged from Ubuntu:
+    * debian/patches/06_volume_icons_change.dpatch:
+      - patch from CVS, don't use the mute icon for non muted volume
+    * debian/patches/07_no_mms_to_mmsh_change.dpatch:
+      - patch from CVS, to automatically change mms to mmsh
+    * debian/patches/08_aspect_ratio_fix.dpatch:
+      - patch from upstream CVS, work by j^ <j@bootlab.org>, fix the aspect
+        ratio setting usage
+    * debian/patches/09_play_protocol_not_listed_by_firefox.dpatch:
+      - patch from upstream, work by Gary Coady <gary@lyranthe.org>, fix the
+        playing of protocols not listed by firefox
+
+  [ Gustavo Noronha Silva ]
+  * debian/patches/01_totem_playlist_add_fix.dpatch:
+  - patch by Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
+    to fix crash on playlist add (Closes: #349357)
+  * debian/control.in, debian/rules:
+  - add xulrunner plugins for totem as new packages (Closes: #321400)
+  - added libxul-dev, and xulrunner (for xpidl) to Build-Deps
+
+  [ Loic Minier ]
+  * Trash all *.a and *.la files not only from debian/totem-gstreamer/usr/lib,
+    but from debian/totem-gstreamer and debian/totem-xine altogether, except
+    for debian/totem-xine/usr/lib/*.a.
+    [debian/rules]
+  * Remove the now useless rm calls on "*a" files.
+    [debian/rules]
+  * Remove config.guess and config.sub updating patch as cdbs takes care of
+    this and hence fix clean target.
+    [debian/rules]
+  * Bump libgnomevfs2-dev build-dep to >= 2.9.92 per configure.ac.
+    [debian/control, debian/control.in]
+  * Fix config.sub / config.guess copying over, even if it's useless.
+    [debian/rules]
+  * Drop useless dh_installdirs calls.
+    [debian/rules]
+  * Remove *-xul packages in favor of a new totem-mozilla package, arch: all.
+    [debian/control, debian/control.in]
+  * Permit "| www-browser" in totem-mozilla's Recommends too.
+    [debian/control, debian/control.in]
+  * Add symlinks in /usr/lib/{firefox,mozilla,xulrunner}/plugins to
+    the mozilla plugin below /usr/lib/totem.
+    [debian/totem-mozilla.links]
+  * Install the mozilla plugin in /usr/lib/totem in totem-xine and
+    totem-gstreamer, drop anything else from /usr/lib/xulrunner.
+    [debian/rules]
+  * Add new patch to force usage of xulrunner, even if mozilla, firefox, or
+    seamonkey are available; WARNING: requires relibtoolizing.
+    [debian/patches/00list,
+     debian/patches/10_configure-force-xulrunner.dpatch]
+  * Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4
+    -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in;
+    WARNING: requires relibtoolizing.
+    [debian/patches/00list,
+     debian/patches/11_configure-drop-mozilla-link-flags.dpatch]
+  * Relibtoolize, as required by the preceding patches.
+    [debian/patches/00list, debian/patches/60_mandatory-relibtoolizing.dpatch]
+  * Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS
+    and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings
+    on schema installation.
+    [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Sat,  6 May 2006 18:38:39 +0200
+
+totem (1.2.1-4) unstable; urgency=low
+
+  * Simple rebuild to get rid of references to Xcursor.la, and Xrender.la.
+
+ -- Loic Minier <lool@dooz.org>  Tue,  2 May 2006 16:09:22 +0200
+
+totem (1.2.1-3) unstable; urgency=low
+
+  *  debian/patches/08_firefox-plugin-fix.dpatch:
+    - upstream patch to fix the firefox plugin crasher
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 13 Jan 2006 00:12:49 +0100
+
+totem (1.2.1-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Gustavo Noronha Silva <kov@debian.org>  Mon,  9 Jan 2006 22:58:02 -0200
+
+totem (1.2.1-1) experimental; urgency=low
+
+  [ Loic Minier ]
+  * Update watch file. [debian/watch]
+
+  [ Sjoerd Simons ]
+  * New upstream release
+  * Recommend gstreamer-theora and ffmpeg.
+  * Depend on llibmusicbrainz4-dev >= 2.1.1-4.1 to get the C++ transitioned
+    version.
+  * Build-Depend on libdbus-glib-1-dev so totem can disable gnome-screensaver
+    via dbus.
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 20 Dec 2005 12:09:07 +0100
+
+totem (1.2.0-1) experimental; urgency=low
+
+  * New upstream release.
+  * Version the libmusicbrainz4-dev build-dep to >= 2.1.1-3.1 to get a
+    C++ transitionned version. [debian/control, debian/control.in]
+  * Drop hardcoded libtotem-plparser0 depends in totem-xine and
+    totem-gstreamer. [debian/control, debian/control.in]
+  * Menu icon fixes: [debian/totem-gstreamer.install,
+    debian/totem-gstreamer.menu, debian/totem-xine.install,
+    debian/totem-xine.menu, debian/totem.xpm]
+    - Convert the upstream PNG icon to XPM.
+    - Install totem.xpm in /usr/share/pixmaps for totem-xine and
+      totem-gstreamer.
+    - Update totem-gstreamer and totem-xine menu files.
+  * Only update config.guess and config.sub if we're in a tree with these
+    files. [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Wed, 14 Sep 2005 13:03:01 +0200
+
+totem (1.1.5-1) experimental; urgency=medium
+
+  * Ship missing shlibs.
+  * New upstream release.
+
+ -- Loic Minier <lool@dooz.org>  Sun, 11 Sep 2005 11:37:42 +0200
+
+totem (1.1.4-1) experimental; urgency=low
+
+  * debian/control.in:
+    - new packages for libtotem-plparser.
+    - updated the Build-Depends.
+    - updated the Standards-Version.
+  * debian/rules:
+    - move libtotem-plparser files to the right place.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 13 Aug 2005 14:24:36 +0200
+
+totem (1.0.4-1) unstable; urgency=low
+
+  * New upstream version:
+    - say that we support 3GPP files.
+    - avoid resizing on startup before we really show the window.
+    - fix a crash when 'Hide controls' is called while starting up.
+    - fix crashes when playing back some files with errors (xine-lib).
+    - fix hand icon not appearing on DVD menus in fullscreen (xine-lib).
+    - fix detection of still images with newer xine-lib.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 28 Jun 2005 12:14:31 +0200
+
+totem (1.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 10 Jun 2005 01:08:45 +0200
+
+totem (1.0.2-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon,  2 May 2005 18:38:08 +0200
+
+totem (1.0.1-1) experimental; urgency=low
+
+  * New upstream version.
+  * debian/control.in:
+    - updated the requirements.
+  * debian/patches/02_crashnull.dpatch,
+    debian/patches/10_vcd_hang.dpatch:
+    - the new version fixes that.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  9 Apr 2005 17:39:02 +0200
+
+totem (0.100-5) unstable; urgency=low
+
+  * Rebuilt for the libhowl transition (Closes: #298872).
+  * debian/control.in:
+    - updated the gnome-vfs requirements.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 10 Mar 2005 19:14:51 +0100
+
+totem (0.100-4) unstable; urgency=low
+
+  * debian/patches/00list:
+    - list the new patch (Closes: #289470).
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 16 Feb 2005 15:09:35 +0100
+
+totem (0.100-3) unstable; urgency=low
+
+  * debian/patches/02_crashnull.dpatch:
+    - updated with the patch from Josselin Mouette <joss@debian.org>.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 13 Feb 2005 12:40:17 +0100
+
+totem (0.100-2) unstable; urgency=low
+
+  * debian/patches/01_gst-plugins-0.8.5.dpatch:
+    - removed, the new gst-plugins is in the archive now.
+  * debian/patches/02_crashnull.dpatch:
+    - added, fix the crash on system without any cdrom drive (Closes: #289470).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 10 Feb 2005 19:05:00 +0100
+
+totem (0.100-1) unstable; urgency=low
+
+  * New upstream release:
+    - implement session management support, remove automatic save/restore of
+      the current playlist (Closes: #255320).
+    - GStreamer DVD support.
+    - make Ctrl+arrows seek further in streams.
+    - turn the cursor into a hand when hovering a menu in a DVD (xine-lib).
+    - zoom in/out support (xine-lib).
+    - implement buffering (GStreamer).
+    - enable visualisation effects (GStreamer) (Closes: #269910).
+    - make the properties page work (GStreamer) and misc. fixes (all)
+      (Hoary: #1453).
+    - add Album metadata to the properties windows.
+    - hide the video properties if a file is an audio-only one.
+    - work-around a bug in GConf that caused playbacks
+      to be very dark (xine-lib).
+    - add 4.1-channel audio support.
+    - fix parsing of sub-directories, and .pls playlists with relative paths.
+  * debian/control.in:
+    - totem-gstreamer and totem-xine Provides totem (Closes: 287981).
+    - updated the descriptions about the subtitle (Closes: #285153).
+  * debian/patches/01_gst-plugins-0.8.5.dpatch:
+    - removed, this fix is in the new version.
+  * debian/watch:
+    - updated.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  8 Jan 2005 16:45:28 +0100
+
+totem (0.99.22-1) unstable; urgency=low
+
+  * New upstream release:
+    - show the popups in fullscreen (GStreamer).
+    - fix multiple volume icons appearing in the playlist.
+    - automatically load text subtitles (xine-lib).
+    - handle Drag'n'drop from Mozilla/Netscape.
+    - implement Drag from the Screenshot dialog to the file manager.
+    - make it possible to play a DVD from the hard-disk (xine-lib).
+    - fix getting the CD type when the drive doesn't implement it.
+    - add an error message when the audio device is busy (GStreamer).
+    - make drag'n'drop work again after double-clicking a playlist entry.
+  * debian/control.in:
+    - updated the Build-Depends and Depends.
+  * debian/patches/01_gst-plugins-0.8.5.dpatch:
+    - make the new version working well with gst-plugins 0.8.5.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 22 Nov 2004 15:57:25 +0100
+
+totem (0.99.20-2) experimental; urgency=low
+
+  * debian/control.in:
+    - Build-Depends on libgstreamer-plugins0.8-dev (Closes: #279038).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 31 Oct 2004 12:38:09 +0100
+
+totem (0.99.20-1) experimental; urgency=low
+
+  * New upstream release:
+     - fix a crash when closing Totem with non-file locations.
+     - set the current file chooser paths correctly.
+     - fix "Play Disc..." when the detected device is a symbolic link.
+     - fix detection of some DVDs, and speed-up disc type detection.
+     - add bitrate support to the GStreamer backend.
+  * debian/control.in:
+     - updated the Build-Depends.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 27 Oct 2004 19:27:57 +0200
+
+totem (0.99.19-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    - updated the debhelper Build-Depends to get dh_desktop.
+  * debian/totem-gstreamer.postinst, debian/totem-xine.postinst:
+    - dh_desktop handles the mime update now.
+  * debian/patches/01_automake.dpatch:
+    - removed.
+  * debian/rules:
+    - use dh_desktop.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 17 Oct 2004 14:51:31 +0200
+
+totem (0.99.17-2) experimental; urgency=low
+
+  * debian/control.in:
+    - updated the Depends on nautilus-cd-burner (Closes: #275886).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 10 Oct 2004 22:28:12 +0200
+
+totem (0.99.17-1) experimental; urgency=low
+
+  * New upstream release:
+    - great overhaul of the GStreamer backend.
+    - fix parsing of Real Media and ASF playlists.
+    - support for writing m3u playlists, including relative paths.
+  * debian/control.in:
+    - updated the Build-Depends.
+    - updated the Standards-Version.
+  * debian/patches/01_automake.dpatch:
+    - run automake to fix the broken build for the gstreamer backend.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  7 Oct 2004 22:13:20 +0200
+
+totem (0.99.16-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    - totem depends on totem-xine | totem-gstreamer (Closes: #270985).
+  * debian/patches/20_use_alternatives.dpatch:
+    - patch from Emil Soleyman-Zomalan <emil@nishra.com> to convert the
+      video-thumbnailer to an alternative. (Closes: #270222).
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 17 Sep 2004 12:17:22 +0200
+
+totem (0.99.15.1-2) unstable; urgency=low
+
+  * debian/control.in:
+    - updated the Build-Depends on libgnomeui-dev (Closes: #263661).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  5 Aug 2004 16:59:26 +0200
+
+totem (0.99.15.1-1) unstable; urgency=low
+
+  * New upstream release.
+    - add a MimeType line to the desktop file (for the new MIME system).
+  * debian/control.in:
+    - updated the Build-Depends.
+  * debian/rules:
+    - added a call to dh_gconf.
+  * debian/totem-gstreamer.postinst, debian/totem-xine.postinst:
+    - removed schemas registration code, dh_gconf handles that.
+    - run update-desktop-database if available.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 24 Jul 2004 13:23:10 +0200
+
+totem (0.99.13-1) unstable; urgency=low
+
+  * New upstream release
+    - Handle Ctrl+P to show the playlist even in hidden controls mode
+      (Closes: #252604).
+  * debian/control.in
+    - Updated the totem-gstreamer description to remove references to xine
+      (Closes: #255420).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  3 Jul 2004 00:01:52 +0200
+
+totem (0.99.12-2) unstable; urgency=low
+
+  * Split the package, now we have:
+    - totem-xine using the xine backend.
+    - totem-gstreamer using the gstreamer backend (Closes: #246058).
+    - totem, dummy package depending on totem-xine (since it seems to be
+      a better default for the moment).
+  * debian/control.in:
+    - updated for the split.
+  * debian/patches:
+    - switched to dpatch.
+  * debian/rules:
+    - switched back to debhelper since cdbs doesn't support multibuild for
+      the moment.
+  * debina/template:
+    - removed debconf's template for the moment, gstreamer-media is not ready
+      to be a suitable alternative for thumbnails (Closes: #235857, #252941).
+  * debian/totem.1:
+    - removed, the manpage is included in the upstream tarball now.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue,  8 Jun 2004 15:16:34 +0200
+
+totem (0.99.12-1) unstable; urgency=low
+
+  * New upstream release
+    + turn off vanity's build.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  6 Jun 2004 03:12:19 +0200
+
+totem (0.99.11-2) unstable; urgency=low
+
+  * Upload in unstable.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 26 May 2004 23:53:54 +0200
+
+totem (0.99.11-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/patches/stock-icon.patch, debian/patches/totem-rwcrash-fix.patch:
+    + removed since included in new version.
+  * debian/control.in:
+    + updated Build-Depends.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  1 May 2004 23:28:02 +0200
+
+totem (0.99.10-3) experimental; urgency=low
+
+  * debian/patches/stock-icon.patch:
+    + patch from Michel Daenzer <daenzer@debian.org> that makes all installed
+      icons loadable by totem (Closes: 243334).
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 27 Apr 2004 00:21:22 +0200
+
+totem (0.99.10-2) experimental; urgency=low
+
+  * debian/patches/totem-rwcrash-fix.patch:
+    + new patch to fix a crasher.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 18 Apr 2004 17:30:38 +0200
+
+totem (0.99.10-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control.in:
+    + updated Build-Depends.
+  * Included Brazilian Portuguese debconf template from Andre Luis Lopes
+    <andrelop@debian.org> (Closes: #235384).
+  * Included new manpage from Andre Lehovich <andrel@U.Arizona.EDU>
+    (Closes: #241814).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 11 Apr 2004 00:46:20 +0200
+
+totem (0.99.9-4) unstable; urgency=low
+
+  * Fixed schemas registration (should fix the problem with colors).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 22 Feb 2004 19:57:11 +0100
+
+totem (0.99.9-3) unstable; urgency=low
+
+  * debian/patches/vcd_hang.patch:
+    + patch to fix hang on start with VCD plugin.
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 17 Feb 2004 19:36:46 +0100
+
+totem (0.99.9-2) unstable; urgency=low
+
+  * GNOME team upload.
+  * [debian/control.in] Added build dependency on scrollkeeper.
+    (Closes: #232588)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sat, 14 Feb 2004 10:10:04 +0100
+
+totem (0.99.9-1) unstable; urgency=low
+
+  * New upstream release
+    + fix bug with directory selection in the file selector (Closes: #225903).
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 13 Feb 2004 19:47:26 +0100
+
+totem (0.99.8-3) unstable; urgency=low
+
+  * Rebuilt with xfree 4.2.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 18 Jan 2004 01:01:37 +0100
+
+totem (0.99.8-2) unstable; urgency=low
+
+  * Fixed a typo in the french debconf translation (Closes: #227311).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 17 Jan 2004 16:58:34 +0100
+
+totem (0.99.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + updated Build-Depends.
+    + updated for the GNOME Team.
+  * debian/rules:
+    + updated for the GNOME Team.
+  * Added french template (Closes: #218730).
+  * Changed the template to remove the "yes" from the description
+    (Closes: #218117).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun,  9 Nov 2003 14:03:46 +0100
+
+totem (0.99.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added debconf option to use or not totem as the nautilus video thumbnailer.
+    (Closes: #212555).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 16 Oct 2003 01:01:24 +0200
+
+totem (0.99.6-1) unstable; urgency=low
+
+  * New upstream release.
+    + playlist improvements (Closes: #211833).
+    + fixed crash on eject (Closes: #211968).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 12 Oct 2003 18:34:48 +0200
+
+totem (0.99.5-1) unstable; urgency=low
+
+  * New upstream release
+    + disable xscreensaver (Closes: #208175).
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 15 Sep 2003 17:55:44 +0200
+
+totem (0.99.4-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  4 Sep 2003 15:41:46 +0200
+
+totem (0.99.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switched to cdbs.
+  * Updated menu icon.
+  * Updated description (Closes: #207007).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 31 Aug 2003 19:53:10 +0200
+
+totem (0.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixed XFree86 lockup on start bug (Closes: #200101).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat,  5 Jul 2003 14:02:13 +0000
+
+totem (0.99.1-2) unstable; urgency=low
+
+  * Build with xfree 4.2 instead 4.3. (Closes: #199335).
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue,  1 Jul 2003 23:49:57 +0200
+
+totem (0.99.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 23 Jun 2003 11:49:55 +0200
+
+totem (0.99.0-2) unstable; urgency=low
+
+  * Added libgnome-desktop-dev to Build-Depends (Closes: #196224).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu,  5 Jun 2003 17:11:25 +0200
+
+totem (0.99.0-1) unstable; urgency=low
+
+  * New upstream release
+    - Fixed DVD/CD playing (Closes: #195090).
+  * Updated to standards version 3.5.10.0.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 31 May 2003 19:19:39 +0200
+
+totem (0.98.0-1) unstable; urgency=low
+
+  * New upstream relase.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 11 May 2003 21:13:06 +0200
+
+totem (0.97.0-1) unstable; urgency=low
+
+  * New upstream release.
+    - Fixed the thumbnailer (Closes: #188979).
+
+ -- Sebastien Bacher <seb128@debian.org>  Tue, 29 Apr 2003 22:13:05 +0200
+
+totem (0.96.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Changed section to gnome.
+  * Updated to standards version 3.5.9.
+  * Updated Description to add Author and Homepage.
+  * Added Depends on ${misc:Depends}.
+  * Updated Build-Depends.
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 10 Apr 2003 11:17:49 +0200
+
+totem (0.95.1-3) unstable; urgency=low
+
+  * This time the schema file should be ok ...
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 28 Mar 2003 21:54:13 +0100
+
+totem (0.95.1-2) unstable; urgency=low
+
+  * Fixed schema file (Closes: #185137).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 27 Mar 2003 17:09:15 +0100
+
+totem (0.95.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 26 Feb 2003 23:43:07 +0100
+
+totem (0.95.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated to standards-version 3.5.8.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 26 Feb 2003 22:01:48 +0100
+
+totem (0.90.0-5) unstable; urgency=low
+
+  * Added "liblircclient-dev" and "libirman-dev" to Build-Depends (Closes: #182195).
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 23 Feb 2003 17:47:25 +0100
+
+totem (0.90.0-4) unstable; urgency=low
+
+  * Apply patch to support playing straight from amazon (Closes: #181485).
+
+ -- Sebastien Bacher <seb128@debian.org>  Thu, 20 Feb 2003 17:19:18 +0100
+
+totem (0.90.0-3) unstable; urgency=low
+
+  * Register totem-video-thumbnail schemas (Closes: #179343).
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed,  5 Feb 2003 01:13:54 +0100
+
+totem (0.90.0-2) unstable; urgency=low
+
+  * Update README file.
+  * Update Build-Depends.
+  * Remove obsolete depend on xine-dvdnav (Closes: #179160).
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 31 Jan 2003 10:59:36 +0100
+
+totem (0.90.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Should close the FTBFS (Closes: #176530).
+  * Updated Build-Depends.
+
+ -- Sebastien Bacher <seb128@debian.org>  Wed, 29 Jan 2003 20:39:02 +0100
+
+totem (0.13.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated xine-lib Depends.
+  * Totem doesn't use xine logo any more (Closes: #160429).
+  * Updated xpm icon for debian menu.
+  * Updated to standards-version 3.5.7.
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri,  3 Jan 2003 12:34:20 +0100
+
+totem (0.11.0-1) unstable; urgency=low
+
+  * New upstream release (Closes: #161818).
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon, 28 Oct 2002 13:02:10 +0100
+
+totem (0.10.0-3) unstable; urgency=low
+
+  * Added xine-dvdnav to Depends (and not to Build-Depends ...).
+
+ -- Sebastien Bacher <seb128@debian.org>  Fri, 25 Oct 2002 01:17:52 +0200
+
+totem (0.10.0-2) unstable; urgency=low
+
+  * Added xine-dvdnav to Build-Depends.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 20 Oct 2002 00:22:30 +0200
+
+totem (0.10.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Sebastien Bacher <seb128@debian.org>  Mon,  2 Sep 2002 19:14:31 +0200
+
+totem (0.9.1-1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sat, 24 Aug 2002 15:12:51 +0200
+
+
--- totem-2.21.92.orig/debian/compat
+++ totem-2.21.92/debian/compat
@@ -0,0 +1 @@
+5
--- totem-2.21.92.orig/debian/test.html
+++ totem-2.21.92/debian/test.html
@@ -0,0 +1,51 @@
+<html>
+<head>
+<title>Test</title>
+</head>
+<body>
+<div align="middle">
+<h1>PIMP</h1>
+<h3>PIMP Internet Media Player</h3>
+<table cellspacing="12" cellpadding="0">
+<tr>
+  <td colspan="3">
+<embed src="file:///home/lool/fnu/apple_promouse.mpeg"
+  width="384" height="300" controller="false" enablejavascript="true"
+  bgcolor=#000000 autoplay="true" name="player"/>
+  </td>
+</tr>
+<tr>
+  <td align="middle">
+    <img src="file:///usr/share/icons/Bluecurve/48x48/stock/media-play.png"
+      onClick="javascript:document.player.Play();"/>
+  </td>
+  <td align="middle">
+    <img src="file:///usr/share/icons/Bluecurve/48x48/stock/media-pause.png"
+      onClick="javascript:document.player.Stop();"/>
+  </td>
+  <td align="middle">
+    <img src="file:///usr/share/icons/Bluecurve/48x48/stock/media-stop.png"
+      onClick="javascript:document.player.Rewind();"/>
+  </td>
+</td>
+</table>
+<script><!--
+  Maybe add in future:
+  - kiosk mode
+
+  Javascript controls:
+  Play() -> play
+  Rewind() -> stop
+  Stop() -> pause
+  GetTimeScale() -> get units per second (e.g. milliseconds)
+  SetTime(int time) / GetTime() -> query/seek (in timescale)
+  GetVolume() / SetVolume (int vol) -> set/get volume (?)
+  SetIsLooping(boolean loop) / GetIsLooping() -> get/set loop
+  GetMute() / SetMute(boolean mute) -> set/get mute
+  SetTarget(string url) / GetTarget() -> change HREF
+  SetURL(string url) / GetURL() -> change URL
+  GetDuration() -> get movie length (in timescale)
+--></script>
+</div>
+</body>
+</html>
--- totem-2.21.92.orig/debian/totem.xpm
+++ totem-2.21.92/debian/totem.xpm
@@ -0,0 +1,295 @@
+/* XPM */
+static char *totem32[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 257 2",
+"   c #0036002D0033",
+".  c #0CF205BE054F",
+"X  c #0A69088E07CC",
+"o  c #0B9D0AF70B7E",
+"O  c #0ECF0F7C1132",
+"+  c #0F9B10BD12FF",
+"@  c #1054026800A8",
+"#  c #11D608FB06F2",
+"$  c #14860D040B1D",
+"%  c #11A211D60E03",
+"&  c #1843117C0E83",
+"*  c #14FA13561411",
+"=  c #192014C41318",
+"-  c #1C561B2C16E8",
+";  c #1E0F1A701A4F",
+":  c #21711E3C1E37",
+">  c #35A80ED1065D",
+",  c #269A24682344",
+"<  c #293724DE24F4",
+"1  c #2C532A6B2C09",
+"2  c #318E2ACC2599",
+"3  c #34AC2C292B48",
+"4  c #378234762B68",
+"5  c #3AF2363B2EC1",
+"6  c #3AC3396D2CF3",
+"7  c #368E33DA35D6",
+"8  c #3C1C30B9351E",
+"9  c #3C56394D3A23",
+"0  c #411939DC3767",
+"q  c #5C8F296C24A3",
+"w  c #64622F0E1EB1",
+"e  c #6C3D2F022631",
+"r  c #73AF2EA72E2E",
+"t  c #79783FA73260",
+"y  c #49A044363EE0",
+"u  c #50B84BD33B0E",
+"i  c #765643D233CC",
+"p  c #424942484258",
+"a  c #48BB47A94871",
+"s  c #4B45494E4A58",
+"d  c #4CF9443D41CB",
+"f  c #55E24790468B",
+"g  c #537C49E545CC",
+"h  c #5AF05A0A415E",
+"j  c #597F56BA5301",
+"k  c #5F735A5558B1",
+"l  c #5B3F5B40562C",
+"z  c #661C5D7E5420",
+"x  c #68805D5956EF",
+"c  c #6C6B5B825C68",
+"v  c #7A8A556E4A0F",
+"b  c #6FBD69DA576D",
+"n  c #6D206BD46025",
+"m  c #63E164AA6A7D",
+"M  c #67DD6BCB7E26",
+"N  c #774E6BAB64BA",
+"B  c #7DF96FEB7031",
+"V  c #771973BF64F9",
+"C  c #75AA77846F32",
+"Z  c #7CAB74E2738A",
+"A  c #7FAD7BA679CB",
+"S  c #8ADF392725FE",
+"D  c #86E53C0039C8",
+"F  c #8CAF39983584",
+"G  c #86E13D3F376D",
+"H  c #8F2743CF393A",
+"J  c #8435508E3E97",
+"K  c #ABCF52003F09",
+"L  c #82B260394D6E",
+"P  c #95075EF74BF6",
+"I  c #827680605D44",
+"U  c #9F1E6D7D5C19",
+"Y  c #842B6AD16418",
+"T  c #841276DA6CEB",
+"R  c #81427C5B79D8",
+"E  c #8E9A785C70AB",
+"W  c #89947C7970E2",
+"Q  c #8B477CEA7D44",
+"!  c #93E070E16588",
+"~  c #989178B873FA",
+"^  c #ACCE58C547CE",
+"/  c #B19F56994769",
+"(  c #B1A95C2643A8",
+")  c #B1DB5C9D4944",
+"_  c #A3D86F875AA0",
+"`  c #BD4366315105",
+"'  c #BDA66B6953CE",
+"]  c #A17E6D8A614A",
+"[  c #A59873C460E0",
+"{  c #A53F7AB56C16",
+"}  c #C266684D584A",
+"|  c #C34F7E885D15",
+" . c #CB4F78755490",
+".. c #CB7175415E7A",
+"X. c #CC82795C5564",
+"o. c #D32C799C5D55",
+"O. c #D9D57CE15ED3",
+"+. c #C86179CA60A4",
+"@. c #D31F7FD761E1",
+"#. c #DF128021615F",
+"$. c #8D1E89C062AE",
+"%. c #8B158240644A",
+"&. c #8F698D067CF6",
+"*. c #934B8FAB670C",
+"=. c #95B8874A7EB6",
+"-. c #92ED9185685A",
+";. c #95E3940B6B66",
+":. c #99A992BF6D31",
+">. c #9DA195D27124",
+",. c #9E3394B67E10",
+"<. c #9DF09A1E73F1",
+"1. c #A59183A2729B",
+"2. c #A6F890067FBC",
+"3. c #A2639E2579B9",
+"4. c #A9EB9B967C5F",
+"5. c #A8F5A3E57F8F",
+"6. c #CF7184796493",
+"7. c #C2A18FFE792B",
+"8. c #D3EA8190660D",
+"9. c #DA358CC06DBD",
+"0. c #D8CD8FA2753E",
+"q. c #DBA18D4970B5",
+"w. c #E3CA8E556F30",
+"e. c #E1799BDD7EB5",
+"r. c #EDB198647DF7",
+"t. c #F1168F777D4F",
+"y. c #8681894C815E",
+"u. c #882A8EC08BB2",
+"i. c #895E84268109",
+"p. c #85A88ABB9E6A",
+"a. c #8E8990509D2D",
+"s. c #90DB8D69877D",
+"d. c #869793A4A938",
+"f. c #899A97BBAE09",
+"g. c #949297FEA2AD",
+"h. c #958B9B91A817",
+"j. c #927D9B4DB63B",
+"k. c #A0C88EC282A1",
+"l. c #A73B98778929",
+"z. c #AC0B9CC38D04",
+"x. c #ADBC9EB89298",
+"c. c #B7259CF39ADE",
+"v. c #AF2EA82985BE",
+"b. c #AE05A0CB9036",
+"n. c #AE57A8AD8524",
+"m. c #AA8BA8EA9914",
+"M. c #B2CFA1348418",
+"N. c #B7EEAF828E9C",
+"B. c #BD24A6EC8E99",
+"V. c #B89BA7AC9772",
+"C. c #B8D3A85297EA",
+"Z. c #BBAFAA7E99F5",
+"A. c #B885B3F49694",
+"S. c #ABB4A73DB09D",
+"D. c #AA1AB0F1ABE9",
+"F. c #B8A0AEEAA9BA",
+"G. c #B92AA566AA14",
+"H. c #BB66AA23A799",
+"J. c #BD45B04FB37E",
+"K. c #B841B582AD8F",
+"L. c #B636B5D4B2DE",
+"P. c #B666BD6FB52B",
+"I. c #C03CB3EEB380",
+"U. c #BE05BAB8B6A7",
+"Y. c #C3879B929C15",
+"T. c #DB769C8C82C2",
+"R. c #C82BAE189976",
+"E. c #C2FAB4279E51",
+"W. c #C1ECAC69ABAA",
+"Q. c #C526B317A246",
+"!. c #C247BEA6A672",
+"~. c #CBBBB672A67D",
+"^. c #CEE3B14BAF8C",
+"/. c #CBFCBC4FA570",
+"(. c #CDFCBC71AAC5",
+"). c #C647BE76BD02",
+"_. c #D42AAD2DAA8C",
+"`. c #D845B12BAEBA",
+"'. c #D1CBBF6FADA0",
+"]. c #DBECBD6FAEC5",
+"[. c #D4C2B6A6B341",
+"{. c #D6ECB9C6B381",
+"}. c #DBAEBEA1B27E",
+"|. c #E79C99E18123",
+" X c #F692936C80D0",
+".X c #ED32A38E89FC",
+"XX c #E604AD28978E",
+"oX c #FBE9A88088AD",
+"OX c #FB8DAC608C1F",
+"+X c #F422A9CD96BF",
+"@X c #FD4BAE7A933D",
+"#X c #F5FEBA729DD4",
+"$X c #FFFFB0E6959C",
+"%X c #FAB0B38A9C1A",
+"&X c #F359B3AC95B4",
+"*X c #E1BFB573B114",
+"=X c #C5C1C35EADDD",
+"-X c #C3BFC664B7A9",
+";X c #C482C700BCDD",
+":X c #C4F4CA67BF81",
+">X c #C959C7C3B44D",
+",X c #CCD8CB81BB8B",
+"<X c #D51CC29DAD9F",
+"1X c #D508C483B2FB",
+"2X c #D154CB95B7E5",
+"3X c #D1EFCE5AC025",
+"4X c #DE2AC464B656",
+"5X c #DDA1C56BBC38",
+"6X c #DB74CBC2BC19",
+"7X c #E3A1CAF7BCE6",
+"8X c #E9E0D3F2BDCF",
+"9X c #EA84DA0FBFA5",
+"0X c #FFFFCCE3B30C",
+"qX c #C5F4CCCFC48E",
+"wX c #D168D247C764",
+"eX c #D76BD5BBCBFC",
+"rX c #DEA2D9FACD83",
+"tX c #D410DC52D3CE",
+"yX c #DD2ED6FAD225",
+"uX c #DC1DDBC7D560",
+"iX c #DE28E2AFD628",
+"pX c #E625CFCFC2AC",
+"aX c #E24ED0EDC83B",
+"sX c #EB34D3F8C312",
+"dX c #EB2FD635CAEA",
+"fX c #EDC5DB18C622",
+"gX c #EE62DB4CCBE2",
+"hX c #E2ADD70BD3EB",
+"jX c #E517DE00D607",
+"kX c #E3F8DE55DA48",
+"lX c #EC5CD737D4B7",
+"zX c #EEDEDB12D1F9",
+"xX c #F2C1E0D6CE4F",
+"cX c #FFFFD813C1F9",
+"vX c #FFFFDB99C4B3",
+"bX c #F81ADE6EDCB4",
+"nX c #EFCFE34FD0E9",
+"mX c #E921E2D1DD3B",
+"MX c #ED4CEB2FD6F2",
+"NX c #E332E41BD585",
+"BX c #F416E6A2D4B1",
+"VX c #F4B0E6FEE033",
+"CX c #F32EED3BD720",
+"ZX c #F8E0E92BDCC7",
+"AX c #F91EE24CDF53",
+"SX c #F9CEEA08D5BA",
+"DX c #FA84ED1DE06D",
+"FX c #E813E914E198",
+"GX c #EBBCE63DE27F",
+"HX c #F02DEB99E3F2",
+"JX c #F731EDA1E464",
+"KX c #F639EE90EA3D",
+"LX c #FACBE7A7E3D3",
+"PX c #FB8DEBD3E3C5",
+"IX c #FBF4F2C4ED74",
+"UX c #F5B9F333EC10",
+"YX c None",
+/* pixels */
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"a     . q t P [ 1.1.{ ] Z m o       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"a     . F / O.OX0XvX%X X`.h.*       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p     . r F K o.|.XX..} Y.f.O       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p       . # # $ # $ # # * *         YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p       @ > w i L P _ ] ~ M o       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p       > S ( ' 8.r.@X$X`.j.+       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p     . e ) ' ` +.q.q.0.G.p.O       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p     . H ' 8.o. .6.9.e.S.a.o       YXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"p     # H ` w.OX&X#X#X+XI.g.+             YXYXYXYXYXYXYXYXYXYXYX",
+"p     . F ( 8.oX0XcX%Xt._.g.+ X ; 8 d y 4 = .   YXYXYXYXYXYXYXYX",
+"p     . r F K o.|.XX..` Y.d.1 z k.c.5X1Xz.W z ,     YXYXYXYXYXYX",
+"p       . . . $ $ $ @ # ; s F.gX8X[.pX1XZ.Z.'.,.6 o   YXYXYXYXYX",
+"p       @ > w i L P _ L f W.LXPXfX}.5X1XZ.Q.<Xn.I 4 . YXYXYXYXYX",
+"p       > S ) ' @.r.|.! G.bXbXLXSX7X}.{.Z.(.N.;.-.%.2   YXYXYXYX",
+"p     . e ) ' ` ..9._ s.LXLXbXbXZXgX5X>XE.E.<.-.4.R.E * YXYXYXYX",
+"p     . H ' 8.8.X.| L E.SXPXPXAXLXIXKXHXjXA.>.B.].sX6Xp   YXYXYX",
+"<     . G ^ 6.e.T.7.Y ~.7X9XgXZXIXuXi.Z K.rX<XsXxXMXMXC o YXYXYX",
+"        . # $ & = - c ^.{.{.4XdXGXA < : j uXJXiXuXtXtXu.+ YXYXYX",
+"YXYXYXYXYXYXYXYXYX  N pXpX7X5XaXyXk < 1 a ;XiX-X-X-X-Xy.o YXYXYX",
+"YXYXYXYXYXYXYXYXYX  x (./.~.Z.(.kXs.9 9 A FXkX,X>X=X!.V o YXYXYX",
+"YXYXYXYXYXYXYXYXYX  0 l.V.Z.Q./.2XeXU.L.kXJXzXlXhXyXwXl o YXYXYX",
+"YXYXYXYXYXYXYXYXYX  * T E.(.<XM.3.<XUXmXmXzXfXgXlXlXI.7   YXYXYX",
+"YXYXYXYXYXYXYXYXYXYXX g /.E.5.-.2.7XNX-X,XlXgXfXfXdXB *   YXYXYX",
+"YXYXYXYXYXYXYXYXYXYX  - b 3.*.:.R.gXiX;X>XyXlXgX9Xx.< . YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYX  - h *.M.4XnXiX:X!.eXlXlXx.5 o   YXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYX  * u k.7XCXuXqX!.,X).Q 3 .   YXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYX  X 3 N m.P.D.&.n p * X   YXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYX      o ; - * = O X     YXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX              YXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX",
+"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX"
+};
--- totem-2.21.92.orig/debian/totem-gstreamer.README.Debian
+++ totem-2.21.92/debian/totem-gstreamer.README.Debian
@@ -0,0 +1,9 @@
+---[ Configuring the output sink
+
+You can choose your preferred output sink by using gnome-sound-properties (in
+the gnome-control-center package), or by editing the GConf key:
+    /system/gstreamer/0.10/default/musicaudiosink
+
+The default is to detect your output sink automagically.
+
+
--- totem-2.21.92.orig/debian/watch
+++ totem-2.21.92/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.gnome.org/sources/totem/([\d\.]+)[02468]/totem-([\d\.]+)\.tar\.gz
--- totem-2.21.92.orig/debian/totem-common.install
+++ totem-2.21.92/debian/totem-common.install
@@ -0,0 +1 @@
+debian/totem.xpm usr/share/pixmaps
--- totem-2.21.92.orig/debian/copyright
+++ totem-2.21.92/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Sebastien Bacher <seb128@debian.org> on
+Sat, 24 Aug 2002 15:12:51 +0200.
+
+It was downloaded from http://www.hadess.net/totem.php3
+
+Upstream Author: Bastien Nocera <hadess@hadess.net>
+
+License:
+
+ Totem is distributed under the GPL by default, with a special excemption
+ clause added:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+ The excemption clause is:
+    The Totem project hereby grants permission for non-GPL compatible GStreamer
+    plugins to be used and distributed together with GStreamer and Totem. This
+    permission is above and beyond the permissions granted by the GPL licensei
+    by which Totem is covered. If you modify this code, you may.  extend this
+    exception to your version of the code, but you are not obligated.  to do
+    so. If you do not wish to do so, delete this exception statement from.
+    your version.
+
+ The Totem Playlist parser library, "pl-parser", is licensed under the terms of
+ the LGPL.  This includes the files starting with totem-pl-parser* in the src
+ directory.  See <http://bugzilla.gnome.org/show_bug.cgi?id=164193> for
+ details.
+
+    This package is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
--- totem-2.21.92.orig/debian/control.in
+++ totem-2.21.92/debian/control.in
@@ -0,0 +1,222 @@
+Source: totem
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Sebastien Bacher <seb128@debian.org>
+Uploaders: @GNOME_TEAM@
+Build-Depends: debhelper (>= 5),
+               quilt,
+               libgtk2.0-dev (>= 2.12.1),
+               libglib2.0-dev (>= 2.13.4),
+               libgnomeui-dev (>= 2.6.1.1-4),
+               libglade2-dev (>= 2.4.0),
+               libgnomevfs2-dev (>= 2.16.0),
+               libxine-dev (>= 1.1.4),
+               liblircclient-dev (>= 0.6.6),
+               libirman-dev (>= 0.4.2),
+               gnome-pkg-tools (>= 0.10),
+               scrollkeeper (>= 0.3.14-5),
+               libxml-parser-perl,
+               libgstreamer0.10-dev (>= 0.10.12),
+               libgstreamer-plugins-base0.10-dev (>= 0.10.12),
+               gstreamer0.10-tools (>= 0.10.12),
+               gstreamer0.10-plugins-base (>= 0.10.12),
+               gstreamer0.10-plugins-good,
+               librsvg2-dev (>= 2.16.0-2),
+               librsvg2-common (>= 2.16.0-2),
+               libnautilus-extension-dev,
+               iso-codes,
+               libmusicbrainz4-dev (>= 2.1.1-4.1),
+               gnome-icon-theme (>= 2.15.90),
+               libdbus-glib-1-dev (>= 0.61),
+               xulrunner-1.9-dev,
+               intltool,
+               autotools-dev,
+               dpkg-dev (>= 1.13.19),
+               libgconf2-dev,
+               shared-mime-info (>= 0.22),
+               libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+               libxtst-dev,
+               libgnome2-dev (>= 2.14.0),
+               libxrandr-dev (>= 1.1.1),
+               libxxf86vm-dev (>= 1.0.1),
+               libx11-dev,
+               gnome-doc-utils,
+               libgnome-settings-daemon-dev (>= 2.17.4),
+               python-dev (>= 2.3),
+               python-gobject-dev,
+               python-gtk2-dev (>= 2.12),
+               libbluetooth-dev,
+               liblaunchpad-integration-dev,
+               libgnome-keyring-dev,
+               libtrackerclient-dev,
+               libtotem-plparser-dev (>= 2.21.90),
+               libstartup-notification0-dev
+Standards-Version: 3.7.3
+
+Package: totem
+Architecture: all
+Depends: ${misc:Depends},
+         totem-plugins (>= ${source:Version}),
+         totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version})
+Description: A simple media player for the Gnome desktop (dummy package)
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This dummy package installs Totem with the GStreamer backend by
+ default.
+
+Package: totem-xine
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gnome-icon-theme (>= 2.15.90),
+         iso-codes,
+         totem-common (>= ${gnome:Version}),
+         totem-common (<< ${gnome:NextVersion})
+Recommends: totem-mozilla (= ${source:Version}),
+            totem-plugins,
+            libxine1-ffmpeg
+Conflicts: totem (<< 0.99.12-2),
+           totem-mozilla (<< 2.20.0-3)
+Description: A simple media player for the Gnome desktop based on xine
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats. It features :
+ .
+    * Shoutcast, m3u, asx, SMIL and ra playlists support
+    * DVD (with menus), VCD and Digital CD (with CDDB) playback
+    * TV-Out configuration with optional resolution switching
+    * 4.0, 5.0, 5.1 and stereo audio output
+    * Full-screen mode (move your mouse and you get nice controls) with
+      Xinerama, dual-head and RandR support
+    * Aspect ratio toggling, scaling based on the video's original size
+    * Full keyboard control
+    * Simple playlist with repeat mode and saving feature
+    * Gnome and Nautilus integration
+    * Screenshot of the current movie
+    * Brightness and Contrast control
+    * Visualisation plugin when playing audio-only files
+    * Video thumbnailer for nautilus
+    * Nautilus properties page
+    * Works on remote displays
+    * DVD, VCD and OGG/OGM subtitles with automatic language selection
+    * Extensible with plugins
+ .
+  Author:   Bastien Nocera <hadess@hadess.net>
+  Homepage: http://www.hadess.net/totem.php3
+
+Package: totem-gstreamer
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         gstreamer0.10-gnomevfs,
+         gstreamer0.10-plugins-base,
+         gstreamer0.10-alsa | gstreamer0.10-audiosink,
+         gstreamer0.10-plugins-good,
+         gstreamer0.10-x,
+         gnome-icon-theme (>= 2.15.90),
+         iso-codes,
+         totem-common (>= ${gnome:Version}),
+         totem-common (<< ${gnome:NextVersion})
+Conflicts: totem (<< 0.99.12-2),
+           gnome-control-center (<< 2.15.90),
+           totem-mozilla (<< 2.20.0-3)
+Recommends: totem-mozilla (= ${source:Version}),
+            totem-plugins,
+            gnome-control-center (>= 2.15.90)
+Suggests: gstreamer0.10-plugins-ugly,
+          gstreamer0.10-ffmpeg,
+          gnome-app-install          
+Description: A simple media player for the Gnome desktop based on gstreamer
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats. It features :
+ .
+    * Shoutcast, m3u, asx, SMIL and ra playlists support
+    * DVD (with menus), VCD and Digital CD (with CDDB) playback
+    * TV-Out configuration with optional resolution switching
+    * 4.0, 5.0, 5.1 and stereo audio output
+    * Full-screen mode (move your mouse and you get nice controls) with
+      Xinerama, dual-head and RandR support
+    * Aspect ratio toggling, scaling based on the video's original size
+    * Full keyboard control
+    * Simple playlist with repeat mode and saving feature
+    * Gnome, Nautilus and Gnome-vfs integration
+    * Screenshot of the current movie
+    * Brightness and Contrast control
+    * Visualisation plugin when playing audio-only files
+    * Video thumbnailer for nautilus
+    * Nautilus properties page
+    * Works on remote displays
+    * DVD, VCD and OGG/OGM subtitles with automatic language selection
+    * Extensible with plugins
+ .
+  Author:   Bastien Nocera <hadess@hadess.net>
+  Homepage: http://www.hadess.net/totem.php3
+
+Package: totem-mozilla
+Architecture: all
+Section: web
+Depends: ${misc:Depends},
+         totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}),
+         dbus (>= 0.61)
+Recommends: epiphany-browser | www-browser
+Replaces: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Provides: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Conflicts: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Description: Totem Mozilla plugin
+ This package contains the Totem Mozilla plugin, which will
+ enhance your Gecko-based browser to be able to display movie
+ clips.
+ .
+ This plugin should work for Firefox as well as XULRunner based browsers.
+
+Package: totem-common
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Description: Data files for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains common data files and translations.
+
+Package: totem-dbg
+Architecture: any
+Section: libs
+Priority: extra
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+         ${misc:Depends}
+Conflicts: libtotem-plparser1-dbg, libtotem-plparser10-dbg
+Description: Debugging symbols for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains detached debugging symbols.
+
+Package: totem-plugins
+Architecture: any
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Suggests: gromit, python-gdata
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Description: Plugins for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains a set of recommended plugins for Totem, which
+ allow to:
+ .
+    * Annotate the screen with the Gromit tool
+    * Control Totem with an Infrared remote control
+    * Control Totem with the keyboard's media player keys
+    * Keep the Totem window on top of the screen
+    * Display movie properties
+    * Deactivate the screensaver when a movie is playing
+    * Skip to a defined time in the movie
+    * Set the away status in the instant messenger when a movie is
+      playing
+    * Control totem with a mobile phone using the Bluetooth protocol
+ .
+ Additional plugins can be written in C, Python or Vala.
--- totem-2.21.92.orig/D
+++ totem-2.21.92/D
@@ -0,0 +1,63 @@
+--- data/totem.ui	2008-01-25 14:42:33.000000000 +0000
++++ data/totem.ui.new	2008-02-04 19:38:26.000000000 +0000
+@@ -493,6 +493,9 @@
+          </menu>
+          <menu name="help" action="help-menu">
+             <menuitem name="contents" action="contents"/>
++            <separator/>
++            <placeholder name='LaunchpadItems'/>
++            <separator/>
+             <menuitem name="about" action="about"/>
+          </menu>
+       </menubar>
+--- configure.in	2008-02-04 18:19:22.000000000 +0000
++++ configure.in.new	2008-02-04 19:36:38.000000000 +0000
+@@ -234,11 +234,11 @@
+ dnl Also check if we're going to be using GTK+ only
+ if test x$ENABLE_GTK = "xno" ; then
+ # FIXME: use gmodule-no-export instead!
+-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ 	HAVE_GNOME=yes
+ else
+ # FIXME: use gmodule-no-export instead!
+-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ 	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
+ 	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
+ 	HAVE_GNOME=no
+--- src/totem-menu.c	2008-02-04 16:32:03.000000000 +0000
++++ src/totem-menu.c.new	2008-02-04 19:40:00.000000000 +0000
+@@ -26,6 +26,8 @@
+ #include <glib/gi18n.h>
+ #include <string.h>
+ 
++#include <launchpad-integration.h>
++
+ #include "totem-menu.h"
+ #include "totem.h"
+ #include "totem-interface.h"
+@@ -1331,5 +1333,7 @@
+ 	totem->languages_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+ 	totem->subtitles_action_group = NULL;
+ 	totem->subtitles_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
++         launchpad_integration_add_ui(totem->ui_manager, "ui/tmw-menubar/help/LaunchpadItems");
++
+ }
+ 
+--- configure.in	2008-02-04 18:19:22.000000000 +0000
++++ configure.in.new	2008-02-04 19:36:38.000000000 +0000
+@@ -234,11 +234,11 @@
+ dnl Also check if we're going to be using GTK+ only
+ if test x$ENABLE_GTK = "xno" ; then
+ # FIXME: use gmodule-no-export instead!
+-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS  gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ 	HAVE_GNOME=yes
+ else
+ # FIXME: use gmodule-no-export instead!
+-	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++	PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ 	AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
+ 	AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
+ 	HAVE_GNOME=no