--- totem-2.22.1.orig/config.sub
+++ totem-2.22.1/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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-16'
+timestamp='2009-06-11'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -152,6 +153,9 @@
 		os=
 		basic_machine=$1
 		;;
+        -bluegene*)
+	        os=-cnk
+		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@@ -249,13 +253,16 @@
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
+	| maxq | mb | microblaze | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
+	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
+	| mips64r5900 | mips64r5900el \
+	| mips64vr | mips64vrel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@@ -268,6 +275,7 @@
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
+	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@@ -277,7 +285,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -286,7 +294,7 @@
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
+	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
 	m6811 | m68hc11 | m6812 | m68hc12)
@@ -329,14 +337,17 @@
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
+	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
+	| mips64r5900-* | mips64r5900el-* \
+	| mips64vr-* | mips64vrel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@@ -358,20 +369,20 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
 	| tron-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-*)
+	| z8k-* | z80-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@@ -439,6 +450,10 @@
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
+	aros)
+		basic_machine=i386-pc
+		os=-aros
+		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@@ -455,10 +470,18 @@
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
+	bluegene*)
+		basic_machine=powerpc-ibm
+		os=-cnk
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
+        cegcc)
+		basic_machine=arm-unknown
+		os=-cegcc
+		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@@ -526,6 +549,10 @@
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
+	dicos)
+		basic_machine=i686-pc
+		os=-dicos
+		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@@ -1128,6 +1155,10 @@
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
+	z80-*-coff)
+		basic_machine=z80-unknown
+		os=-sim
+		;;
 	none)
 		basic_machine=none-none
 		os=-none
@@ -1166,7 +1197,7 @@
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1236,10 +1267,11 @@
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+	      | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
+	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@@ -1248,7 +1280,7 @@
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
+	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@@ -1388,6 +1420,9 @@
 	-zvmoe)
 		os=-zvmoe
 		;;
+	-dicos*)
+		os=-dicos
+		;;
 	-none)
 		;;
 	*)
@@ -1585,7 +1620,7 @@
 			-sunos*)
 				vendor=sun
 				;;
-			-aix*)
+			-cnk*|-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- totem-2.22.1.orig/config.guess
+++ totem-2.22.1/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
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 #   Free Software Foundation, Inc.
 
-timestamp='2008-01-08'
+timestamp='2009-06-10'
 
 # 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
@@ -170,7 +170,7 @@
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
+			| grep -q __ELF__
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@@ -324,6 +324,9 @@
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
+    s390x:SunOS:*:*)
+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	exit ;;
     sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
@@ -331,7 +334,20 @@
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	eval $set_cc_for_build
+	SUN_ARCH="i386"
+	# If there is a compiler, see if it is configured for 64-bit objects.
+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+	# This test works for both compilers.
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	    then
+		SUN_ARCH="x86_64"
+	    fi
+	fi
+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
     sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@@ -640,7 +656,7 @@
 	    # => hppa64-hp-hpux11.23
 
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
+		grep -q __LP64__
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@@ -796,7 +812,7 @@
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    EM64T | authenticamd)
+	    EM64T | authenticamd | genuineintel)
 		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
@@ -806,6 +822,9 @@
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
+    8664:Windows_NT:*)
+	echo x86_64-pc-mks
+	exit ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@@ -866,40 +885,17 @@
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
-    mips:Linux:*:*)
+    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
-	#undef mips
-	#undef mipsel
+	#undef ${UNAME_MACHINE}
+	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
+	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
+	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
@@ -931,10 +927,13 @@
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
+    padre:Linux:*:*)
+	echo sparc-unknown-linux-gnu
+	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -982,17 +981,6 @@
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
@@ -1058,7 +1046,7 @@
     i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     i*86:*DOS:*:*)
@@ -1102,8 +1090,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
@@ -1141,6 +1132,16 @@
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
           && { echo i486-ncr-sysv4; exit; } ;;
+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+	OS_REL='.3'
+	test -r /etc/.relid \
+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
@@ -1153,7 +1154,7 @@
     rs6000:LynxOS:2.*:*)
 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
     SM[BE]S:UNIX_SV:*:*)
@@ -1216,6 +1217,9 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
+	echo i586-pc-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1324,6 +1328,9 @@
     i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
+    i*86:AROS:*:*)
+	echo ${UNAME_MACHINE}-pc-aros
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1484,9 +1491,9 @@
 the operating system you are using. It is advised that you
 download the most up to date version of the config scripts from
 
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
 and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 
 If the version you run ($0) is already up to date, please
 send the following data and any information you think might be
--- totem-2.22.1.orig/debian/compat
+++ totem-2.22.1/debian/compat
@@ -0,0 +1 @@
+5
--- totem-2.22.1.orig/debian/changelog
+++ totem-2.22.1/debian/changelog
@@ -0,0 +1,1505 @@
+totem (2.22.1-0ubuntu3.8.04.6netbook1dennis1) dennis; urgency=low
+
+  * Merged with netbook-common. Remaining changes:
+    - Stop playback when receiving a SIGUSR1 signal.
+
+ -- Nicolas Valcárcel Scerpella <nicolas.valcarcel@canonical.com>  Mon, 05 Jul 2010 11:28:08 -0500
+
+totem (2.22.1-0ubuntu3.8.04.6netbook1) netbook-common; urgency=low
+
+  * Merge with hardy-security. Remaining changes:
+    - If artist/title info is empty, treat it like null and fallback
+      appropriately
+
+ -- Nicolas Valcárcel Scerpella <nicolas.valcarcel@canonical.com>  Mon, 05 Jul 2010 11:16:44 -0500
+
+totem (2.22.1-0ubuntu3.8.04.6) hardy-security; urgency=low
+
+  * Update for Firefox 3.6 transition
+    - see USN-930-1
+  * Add symlinks in /usr/lib/mozilla/plugins for the Mozilla plugin so that 
+    it works with Firefox now using bundled xulrunner
+    - update debian/totem-mozilla.links
+  * Port to xulrunner 1.9.2 / Firefox 3.6. Update for changes to NPAPI headers
+    and don't try to access XPCOM features using NPAPI (it doesn't work now 
+    in 3.6). Access XPCOM features directly where needed and get the plugins
+    DOM element by querying NPNVPluginElementNPObject. Ensure that the viewer
+    handles relative URI's that the plugin now sends with OpenURI when playing
+    local files
+    - bump build-depend in debian/control
+    - add debian/patches/31_totem_xulrunner192.patch
+    - update debian/patches/70_autoconf.patch
+    - update debian/patches/series
+  * Build with --disable-complex-plugin, as this plugin doesn't build now.
+    This means that the totem plugin won't handle realaudio any more
+    - update debian/rules
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Tue, 08 Jun 2010 16:07:00 +0100
+
+totem (2.22.1-0ubuntu3netbook1dennis1) dennis; urgency=low
+
+  * Merge new netbook-common version.
+
+ -- Gary Lasker <gary.lasker@canonical.com>  Mon, 06 Apr 2009 11:21:50 -0400
+
+totem (2.22.1-0ubuntu3netbook1) netbook-common; urgency=low
+
+  * Merge new Hardy release.
+
+ -- Gary Lasker <gary.lasker@canonical.com>  Thu, 05 Mar 2009 11:39:41 -0500
+
+totem (2.22.1-0ubuntu3) hardy-proposed; urgency=low
+
+  * debian/patches/90_youtube_url_update.patch:
+    - upstream change to understand the new youtube url (lp: #288494)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 15 Jan 2009 11:03:18 +0100
+
+totem (2.22.1-0ubuntu2netbook1dennis1+build1) dennis; urgency=low
+
+  * Rebuild for reprepro
+
+ -- Michael Terry <michael.terry@canonical.com>  Thu, 05 Mar 2009 14:51:31 -0500
+
+totem (2.22.1-0ubuntu2netbook1dennis1) hardy; urgency=low
+
+  * 32_stop_on_sigusr1.patch:
+    - Stop playback when receiving a SIGUSR1 signal.  Part of
+      LP: #322053
+
+ -- Michael Terry <michael.terry@canonical.com>  Thu, 05 Mar 2009 14:30:43 -0500
+
+totem (2.22.1-0ubuntu2netbook1) hardy; urgency=low
+
+  * 10_handle_empty_metadata.patch:
+    - If artist/title info is empty, treat it like null and fallback
+      appropriately.
+
+ -- Michael Terry <michael.terry@canonical.com>  Thu, 06 Nov 2008 13:24:18 -0500
+
+totem (2.22.1-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/90_from_svn_fix_youtube_requirement.patch:
+    - change from svn, fix the youtube gstreamer requirement (lp: #214416)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 11 Apr 2008 12:08:52 +0200
+
+totem (2.22.1-0ubuntu1) hardy; urgency=low
+
+  * New upstream version:
+    - Add audio/x-speex as a supported mime-type
+    - Movie player:
+    - Fix crasher when trying to load (unsupported) audio CDs
+    - Fix the bug report script
+    - Check for required GStreamer plugins in the YouTube plugin
+    - GStreamer backend:
+    - Fix a possible crash when forcing use of ximagesink (as is the case
+      for small videos on trailers.apple.com)
+    - xine-lib backend:
+    - Fix potential crasher when copying MRLs from the engine
+  * debian/control.in:
+    - updated the launchpad integration requirements
+  * debian/patches/02_lpi.patch:
+    - updated the launchpad integration changes
+  * debian/patches/26_handle_audio_xspeex.patch:
+    - dropped, fixed in the new version
+  * debian/patches/70_autoconf.patch:
+    - new version update
+
+ -- Sebastien Bacher <seb128@canonical.com>  Tue, 08 Apr 2008 23:00:33 +0200
+
+totem (2.22.0-0ubuntu4) hardy; urgency=low
+
+  * debian/rules: Remove duplicate dh_shlibdeps call.
+  * Install the upstream changelog in totem-common only. Savings: 600kB.
+  * Symlink identical Gnome help files within packages (code taken from cdbs).
+    Savings: 200kB compressed.
+  * Build-depend on fdupes.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 08 Apr 2008 17:30:48 +0200
+
+totem (2.22.0-0ubuntu3) hardy; urgency=low
+
+  * debian/control.in:
+    - list new totem-plugins-extra which contains extra plugins which are not
+      installed by default
+    - totem-plugins depends on python-gdata so it gets installed by default
+      (lp: #178209)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 27 Mar 2008 10:57:53 +0100
+
+totem (2.22.0-0ubuntu2) hardy; urgency=low
+
+  * debian/patches/26_handle_audio_xspeex.patch:
+    - add the x-speex mimetype to the mimetype definitions (lp: #190489)
+  * debian/rules: update translations template (lp: #198366)
+
+ -- Sebastien Bacher <seb128@canonical.com>  Thu, 13 Mar 2008 23:30:32 +0100
+
+totem (2.22.0-0ubuntu1) hardy; urgency=low
+
+  [ Loic Minier ]
+  * New upstream release.
+    - Bump up libgtk2.0-dev build-dep to >= 2.12.6 to match upstream check.
+    - NB: 70_autoconf doesn't need an update (new patch identical).
+    - Upstream NEWS:
+      * Update GTK+ requirement for the accessibility support
+      * Add missing accessibility properties to the interface files
+      * xine-lib backend
+        - Fix crash when using multi-head
+      * GStreamer backend
+        - When resizing a visualisation, resize to the native resolution, not
+          the minimum size
+        - Add DVB-C (digital cable TV) support
+  * Drop spurious differ.patch from diff; *cough*.
+  * Add an update-alternative slave for audio-preview per flavor; LP: #199701.
+
+  [ Sebastien Bacher ]
+  * Drop patch 05_auto_resize and hence don't autoresize by default as
+    requested by upstream as it seems to confuse users.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 11 Mar 2008 10:38:25 +0100
+
+totem (2.21.95-0ubuntu1) hardy; urgency=low
+
+  * New upstream releases.
+    - Upstream NEWS:
+       . Note that configuration files are now in ~/.config/totem/ instead
+         of ~/.gnome2/Totem. You will need to move the files by hand.
+       . Movie player:
+         * Fix crash when pressing a remote button in windowed mode
+         * Fix the YouTube plugin when there's no search results
+         * Better support for using "--fullscreen" on startup
+         * Default to using the fastest speed for MMS streaming
+         * Support auto-loading subtitles when the suffix is upper-case
+         * Add a bug-buddy script so we get more information when totem crashes
+       . Browser plugin:
+         * Support the audio/x-ms-wma mime-type
+         * Better VLC Javascript support
+         * Implement stubs for DivX Player Javascript support
+         * Force opening videos directly with the DivX plugin
+       . GStreamer backend:
+         * Check for DVB plugins before saying it's available
+         * Fix logic in the channels.conf parsing for DVB
+       . Support audio/midi
+       . Only stay on top when video is playing back, not visualisations
+    - Refresh patches 02_lpi, 04_desktop_gettext_domain, 05_auto_resize,
+      25_revert-xine-reqs-bump to apply cleanly
+    - Update patch 70_autoconf; document how to refresh it.
+  * Re-add Xb-Npp-xxx tags accordingly to the firefox-distro-addon-support
+    UbuntuSpec which had been added in 2.19.4-0ubuntu4 and lost in a merge in
+    hardy.
+
+ -- Loic Minier <lool@dooz.org>  Mon, 25 Feb 2008 16:05:00 +0100
+
+totem (2.21.93-0ubuntu2) hardy; urgency=low
+
+  * debian/control.in:
+    - Build depend on libgmyth-dev to activate MythTV plugin (LP: #187582)
+
+ -- Mario Limonciello <superm1@ubuntu.com>  Fri, 15 Feb 2008 00:00:59 -0600
+
+totem (2.21.93-0ubuntu1) hardy; urgency=low
+
+  * New upstream release (LP: #191141)
+    - Movie player:
+      + Make "Aspect ratio" menu items work again
+      + Add DVB playback straight in the "Movie" menu
+      + Add better errors when parts are missing for DVB playback
+      + Fix a crasher when using the mouse scroll in windowed mode (LP: #189967)
+    - Browser plugin:
+      + Fix playback on the Stage6 website
+      + Fix playback of lessons on the arichuvadi.nrcfosshelpline.in site
+      + Fix playback on the Sirius Radio website
+      + Fix playback on the mediathek.zdf.de website
+      + Show errors in the plugin with a logo when there is one
+    - GStreamer backend:
+      + Add support for playing titles from DVDs in the backend
+    - xine-lib backend:
+      + Fix build
+    - Plugins:
+      + Fix build with newer versions of gmyth
+  * debian/patches:
+    - 99_bugzilla_fix_xine_backend.patch: dropped, fixed upstream
+  * debian/control{.in}:
+    - Removed b-d on libgnome-settings-daemon-dev
+ 
+ -- Pedro Fragoso <emberez@gmail.com>  Tue, 12 Feb 2008 01:17:54 +0000
+
+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.22.1.orig/debian/totem-common.install
+++ totem-2.22.1/debian/totem-common.install
@@ -0,0 +1 @@
+debian/totem.xpm usr/share/pixmaps
--- totem-2.22.1.orig/debian/totem-gstreamer.prerm
+++ totem-2.22.1/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.22.1.orig/debian/totem-xine.menu
+++ totem-2.22.1/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.22.1.orig/debian/copyright
+++ totem-2.22.1/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.22.1.orig/debian/totem-xine.prerm
+++ totem-2.22.1/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.22.1.orig/debian/totem.xpm
+++ totem-2.22.1/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.22.1.orig/debian/totem-gstreamer.menu
+++ totem-2.22.1/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.22.1.orig/debian/control
+++ totem-2.22.1/debian/control
@@ -0,0 +1,249 @@
+# This file is autogenerated. DO NOT EDIT!
+# 
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
+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,
+               fdupes,
+               libgtk2.0-dev (>= 2.12.6),
+               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-dev (>= 1.9.2),
+               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,
+               python-dev (>= 2.3),
+               python-gobject-dev,
+               python-gtk2-dev (>= 2.12),
+               libbluetooth-dev,
+               liblaunchpad-integration-dev (>= 0.1.17),
+               libgnome-keyring-dev,
+               libtrackerclient-dev,
+               libtotem-plparser-dev (>= 2.21.90),
+               libstartup-notification0-dev,
+               libgmyth-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})
+Recommends: totem-plugins-extra
+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
+XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
+XB-Npp-Name:  Totem Mozilla plugin
+XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg
+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},
+         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:
+ .
+    * 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.
+
+Package: totem-plugins-extra
+Architecture: any
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: gromit
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3)
+Description: Extra 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 an extra set plugins for Totem, which allow to:
+ .
+    * A live TV and recordings viewer
+    * Annotate the screen with the Gromit tool
+ .
+ Additional plugins can be written in C, Python or Vala.
--- totem-2.22.1.orig/debian/test.html
+++ totem-2.22.1/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.22.1.orig/debian/control.in
+++ totem-2.22.1/debian/control.in
@@ -0,0 +1,244 @@
+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,
+               fdupes,
+               libgtk2.0-dev (>= 2.12.6),
+               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-dev (>= 1.9.2),
+               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,
+               python-dev (>= 2.3),
+               python-gobject-dev,
+               python-gtk2-dev (>= 2.12),
+               libbluetooth-dev,
+               liblaunchpad-integration-dev (>= 0.1.17),
+               libgnome-keyring-dev,
+               libtrackerclient-dev,
+               libtotem-plparser-dev (>= 2.21.90),
+               libstartup-notification0-dev,
+               libgmyth-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})
+Recommends: totem-plugins-extra
+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
+XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
+XB-Npp-Name:  Totem Mozilla plugin
+XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg
+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},
+         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:
+ .
+    * 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.
+
+Package: totem-plugins-extra
+Architecture: any
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: gromit
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3)
+Description: Extra 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 an extra set plugins for Totem, which allow to:
+ .
+    * A live TV and recordings viewer
+    * Annotate the screen with the Gromit tool
+ .
+ Additional plugins can be written in C, Python or Vala.
--- totem-2.22.1.orig/debian/totem-flavor.postinst.in
+++ totem-2.22.1/debian/totem-flavor.postinst.in
@@ -0,0 +1,26 @@
+#! /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-audio-preview totem-audio-preview \
+			/usr/bin/totem-${FLAVOUR}-audio-preview \
+		--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.22.1.orig/debian/rules
+++ totem-2.22.1/debian/rules
@@ -0,0 +1,221 @@
+#!/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
+PLUGEXTRAPKG := totem-plugins-extra
+
+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 \
+	--disable-complex-plugin
+
+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 $@
+	cd po; intltool-update -p
+
+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
+	mkdir -p debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins
+	mv debian/$(PLUGPKG)/usr/lib/totem/plugins/gromit debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins
+	mv debian/$(PLUGPKG)/usr/lib/totem/plugins/mythtv debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins
+	find debian/$(PLUGEXTRAPKG) -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)
+	-rm -f po/totem.pot
+	-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
+	dh_installman -i
+	dh_scrollkeeper -i
+	dh_gconf -i
+	dh_desktop -i
+	dh_compress -i
+	dh_link -i
+	dh_fixperms -i
+	: # symlink identical Gnome help files within packages
+	for p in $$(dh_listpackages -i); do \
+	  if [ -d debian/$$p/usr/share/gnome/help ]; then \
+	    (cd debian/$$p && LC_ALL=C fdupes -r1nq usr/share/gnome/help \
+	    | while read s; do \
+		set -- $$(echo $$s | tr ' ' '\n' | sort); \
+		f=$$1; shift; \
+		for d; do \
+		  echo "symlinking duplicate Gnome help file $$d to $$f"; \
+		  rm $$d; ln -s /$$f $$d; \
+		done; \
+	      done; \
+	    ); \
+	  dh_link -p$$p; \
+	  fi; \
+	done
+	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
+	dh_installchangelogs -ptotem-common ChangeLog
+	dh_desktop -a
+	dh_icons -a
+	dh_compress -a
+	dh_link -a
+	: # symlink identical Gnome help files within packages
+	for p in $$(dh_listpackages -a); do \
+	  if [ -d debian/$$p/usr/share/gnome/help ]; then \
+	    (cd debian/$$p && LC_ALL=C fdupes -r1nq usr/share/gnome/help \
+	    | while read s; do \
+		set -- $$(echo $$s | tr ' ' '\n' | sort); \
+		f=$$1; shift; \
+		for d; do \
+		  echo "symlinking duplicate Gnome help file $$d to $$f"; \
+		  rm $$d; ln -s /$$f $$d; \
+		done; \
+	      done; \
+	    ); \
+	  dh_link -p$$p; \
+	  fi; \
+	done
+	dh_fixperms -a
+	dh_strip -a --dbg-package=totem-dbg
+	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.22.1.orig/debian/totem-mozilla.links
+++ totem-2.22.1/debian/totem-mozilla.links
@@ -0,0 +1,26 @@
+/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
+
+/usr/lib/totem/default/libtotem-basic-plugin.so /usr/lib/mozilla/plugins/libtotem-basic-plugin.so
+/usr/lib/totem/default/libtotem-basic-plugin.xpt /usr/lib/mozilla/plugins/libtotem-basic-plugin.xpt
+/usr/lib/totem/default/libtotem-gmp-plugin.so /usr/lib/mozilla/plugins/libtotem-gmp-plugin.so
+/usr/lib/totem/default/libtotem-gmp-plugin.xpt /usr/lib/mozilla/plugins/libtotem-gmp-plugin.xpt
+/usr/lib/totem/default/libtotem-complex-plugin.so /usr/lib/mozilla/plugins/libtotem-complex-plugin.so
+/usr/lib/totem/default/libtotem-complex-plugin.xpt /usr/lib/mozilla/plugins/libtotem-complex-plugin.xpt
+/usr/lib/totem/default/libtotem-mully-plugin.so /usr/lib/mozilla/plugins/libtotem-mully-plugin.so
+/usr/lib/totem/default/libtotem-mully-plugin.xpt /usr/lib/mozilla/plugins/libtotem-mully-plugin.xpt
+/usr/lib/totem/default/libtotem-narrowspace-plugin.so /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.so
+/usr/lib/totem/default/libtotem-narrowspace-plugin.xpt /usr/lib/mozilla/plugins/libtotem-narrowspace-plugin.xpt
+/usr/lib/totem/default/libtotem-cone-plugin.so /usr/lib/mozilla/plugins/libtotem-cone-plugin.so
+/usr/lib/totem/default/libtotem-cone-plugin.xpt /usr/lib/mozilla/plugins/libtotem-cone-plugin.xpt
+
--- totem-2.22.1.orig/debian/totem.install
+++ totem-2.22.1/debian/totem.install
@@ -0,0 +1 @@
+debian/bug/control /usr/share/bug/totem/
--- totem-2.22.1.orig/debian/totem-gstreamer.README.Debian
+++ totem-2.22.1/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.22.1.orig/debian/watch
+++ totem-2.22.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.gnome.org/sources/totem/([\d\.]+)[02468]/totem-([\d\.]+)\.tar\.gz
--- totem-2.22.1.orig/debian/patches/series
+++ totem-2.22.1/debian/patches/series
@@ -0,0 +1,11 @@
+02_lpi.patch
+04_desktop_gettext_domain.patch
+10_handle_empty_metadata.patch
+20_use_alternatives.patch
+25_revert-xine-reqs-bump.patch
+30_totem_xulrunner19.patch
+31_totem_xulrunner192.patch
+32_stop_on_sigusr1.patch
+70_autoconf.patch
+90_from_svn_fix_youtube_requirement.patch
+90_youtube_url_update.patch
--- totem-2.22.1.orig/debian/patches/10_handle_empty_metadata.patch
+++ totem-2.22.1/debian/patches/10_handle_empty_metadata.patch
@@ -0,0 +1,16 @@
+Index: totem-2.22.1/src/backend/bacon-video-widget-gst-0.10.c
+===================================================================
+--- totem-2.22.1.orig/src/backend/bacon-video-widget-gst-0.10.c	2008-11-06 14:05:28.000000000 -0500
++++ totem-2.22.1/src/backend/bacon-video-widget-gst-0.10.c	2008-11-06 14:06:56.000000000 -0500
+@@ -4407,6 +4407,11 @@
+       g_assert_not_reached ();
+     }
+ 
++  if (string && string[0] == '\0') {
++    g_free (string);
++    string = NULL;
++  }
++
+   if (res && string && g_utf8_validate (string, -1, NULL)) {
+     g_value_take_string (value, string);
+     GST_DEBUG ("%s = '%s'", get_metadata_type_name (type), string);
--- totem-2.22.1.orig/debian/patches/20_use_alternatives.patch
+++ totem-2.22.1/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.22.1.orig/debian/patches/30_totem_xulrunner19.patch
+++ totem-2.22.1/debian/patches/30_totem_xulrunner19.patch
@@ -0,0 +1,164 @@
+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(-)
+
+--- a/configure.in	2008-02-27 12:24:51.000000000 +0100
++++ b/configure.in	2008-02-27 12:25:05.000000000 +0100
+@@ -590,13 +590,19 @@
+ 	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
+@@ -634,24 +640,35 @@
+ # 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
+@@ -683,10 +700,18 @@
+ 
+ # 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])
+@@ -708,8 +733,12 @@
+ 
+ # 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!`"
+@@ -741,8 +770,14 @@
+ 
+ 	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([[
+@@ -763,7 +798,11 @@
+ 	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
+@@ -795,7 +834,7 @@
+ 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])
+ 
--- totem-2.22.1.orig/debian/patches/90_youtube_url_update.patch
+++ totem-2.22.1/debian/patches/90_youtube_url_update.patch
@@ -0,0 +1,70 @@
+Index: totem-2.22.1/src/plugins/youtube/youtube.py
+===================================================================
+--- totem-2.22.1.orig/src/plugins/youtube/youtube.py	2009-01-16 12:11:10.000000000 +0100
++++ totem-2.22.1/src/plugins/youtube/youtube.py	2009-01-16 12:12:09.000000000 +0100
+@@ -1,5 +1,5 @@
+ import totem
+-import gobject, gtk
++import gobject, gtk, gconf
+ import gdata.service
+ import urllib
+ import httplib
+@@ -45,6 +45,10 @@
+ 		"""Check for the availability of the flvdemux and soup GStreamer plugins"""
+ 		bvw_name = totem_object.get_video_widget_backend_name ()
+ 
++		"""If the user's selected 1.5Mbps or greater as their connection speed, grab higher-quality videos
++		   and drop the requirement for the flvdemux plugin."""
++		self.gconf_client = gconf.client_get_default ()
++
+ 		if bvw_name.find ("GStreamer") != -1:
+ 			try:
+ 				import pygst
+@@ -116,6 +120,34 @@
+ 		self.start_index["related"] = 1
+ 		self.results["related"] = 0
+ 		self.get_results ("/feeds/videos/" + urllib.quote (youtube_id) + "/related?max-results=" + str (self.max_results), "related")
++	def resolve_t_param (self, youtube_id):
++		"""We have to get the t parameter from the actual video page, since Google changed how their URLs work"""
++		stream = urllib.urlopen ("http://youtube.com/watch?v=" + urllib.quote (youtube_id))
++		regexp1 = re.compile ("swfArgs.*\"t\": \"([^\"]+)\"")
++		regexp2 = re.compile ("</head>")
++
++		line = stream.readline ()
++		while (line != ""):
++			"""Check for the t parameter, which is now in a JavaScript array on the video page"""
++			matches = regexp1.search (line)
++			if (matches != None):
++				stream.close ()
++				return matches.group (1)
++
++			"""Check to see if we've come to the end of the <head> tag; in which case, we should give up"""
++			if (regexp2.search (line) != None):
++				stream.close ()
++				return ""
++
++			line = stream.readline ()
++
++		stream.close ()
++		return ""
++	def get_fmt_string (self):
++		if self.gconf_client.get_int ("/apps/totem/connection_speed") >= 10:
++			return "&fmt=18"
++		else:
++			return ""
+ 	def on_starting_video (self, treeview, path, user_data):
+ 		"""Display an error if the required GStreamer plugins aren't installed"""
+ 		if self.gstreamer_plugins_present == False:
+@@ -139,11 +171,7 @@
+ 			print "Could not resolve stream MRL for YouTube video \"" + youtube_id + "\"."
+ 			return False
+ 
+-		if response.status == 303:
+-			location = response.getheader("location")
+-			mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + urllib.quote (re.match (".*[?&]t=([^&]+)", location).groups ()[0])
+-		else:
+-			mrl = "http://www.youtube.com/v/" + urllib.quote (youtube_id)
++ 		mrl = "http://www.youtube.com/get_video?video_id=" + urllib.quote (youtube_id) + "&t=" + urllib.quote (self.resolve_t_param (youtube_id)) + self.get_fmt_string ()
+ 		conn.close ()
+ 
+ 		model.set_value (iter, 2, mrl)
--- totem-2.22.1.orig/debian/patches/70_autoconf.patch
+++ totem-2.22.1/debian/patches/70_autoconf.patch
@@ -0,0 +1,4669 @@
+diff -Nurp totem-2.22.1.orig/Makefile.in totem-2.22.1/Makefile.in
+--- totem-2.22.1.orig/Makefile.in	2010-06-24 20:44:31.490069178 +0000
++++ totem-2.22.1/Makefile.in	2010-06-24 20:44:48.330078523 +0000
+@@ -110,7 +110,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -126,6 +128,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -207,6 +211,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+@@ -342,7 +347,6 @@ CLEANFILES = totem.spec
+ DISTCLEANFILES = intltool-extract intltool-merge intltool-update \
+ 		 gnome-doc-utils.make
+ 
+-DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+diff -Nurp totem-2.22.1.orig/aclocal.m4 totem-2.22.1/aclocal.m4
+--- totem-2.22.1.orig/aclocal.m4	2010-06-24 20:44:32.040094043 +0000
++++ totem-2.22.1/aclocal.m4	2010-06-24 20:44:40.190071067 +0000
+@@ -710,6 +710,10 @@ AC_ARG_ENABLE([scrollkeeper],
+ 	enable_scrollkeeper=yes)
+ AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+ 
++dnl disable scrollkeeper automatically for distcheck
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
++
+ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+ ])
+ 
+@@ -945,7 +949,7 @@ AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_IN
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 51 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -1033,7 +1037,6 @@ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -1135,6 +1138,8 @@ file_magic*)
+   ;;
+ esac
+ 
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -1214,9 +1219,80 @@ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ ])# _LT_LINKER_BOILERPLATE
+ 
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++  case $host_os in
++    rhapsody* | darwin*)
++    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++      [lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++   # By default we will add the -single_module flag. You can override
++   # by either setting the environment variable LT_MULTI_MODULE
++   # non-empty at configure time, or by adding -multi_module to the
++   # link flags.
++   echo "int foo(void){return 1;}" > conftest.c
++   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++     -dynamiclib ${wl}-single_module conftest.c
++   if test -f libconftest.dylib; then
++     lt_cv_apple_cc_single_mod=yes
++     rm -rf libconftest.dylib*
++   fi
++   rm conftest.c
++      fi])
++    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++      [lt_cv_ld_exported_symbols_list],
++      [lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++   [lt_cv_ld_exported_symbols_list=yes],
++   [lt_cv_ld_exported_symbols_list=no])
++   LDFLAGS="$save_LDFLAGS"
++    ])
++    case $host_os in
++    rhapsody* | darwin1.[[0123]])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*)
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it?
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++   10.[[012]]*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++   10.*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil="~$DSYMUTIL \$lib || :"
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
++])
+ 
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+@@ -1497,7 +1573,6 @@ s390*-*linux*|sparc*-*linux*)
+       esac
+       ;;
+     *64-bit*)
+-      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -1542,7 +1617,11 @@ sparc*-*solaris*)
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+       yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
++      *)
++        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
+       esac
+       ;;
+     esac
+@@ -1635,7 +1714,7 @@ AC_CACHE_CHECK([$1], [$2],
+        $2=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ ])
+ 
+@@ -1906,7 +1985,7 @@ else
+     AC_CHECK_FUNC([shl_load],
+ 	  [lt_cv_dlopen="shl_load"],
+       [AC_CHECK_LIB([dld], [shl_load],
+-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+@@ -1914,7 +1993,7 @@ else
+ 	    [AC_CHECK_LIB([svld], [dlopen],
+ 		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ 	      [AC_CHECK_LIB([dld], [dld_link],
+-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ 	      ])
+ 	    ])
+ 	  ])
+@@ -2231,7 +2310,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[[4-9]]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2556,13 +2635,11 @@ linux* | k*bsd*-gnu)
+   # 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
+@@ -2574,6 +2651,18 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++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*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -2754,6 +2843,13 @@ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -3253,7 +3349,7 @@ lt_cv_deplibs_check_method='unknown'
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -3348,7 +3444,7 @@ 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
+@@ -3689,7 +3785,7 @@ aix3*)
+   fi
+   ;;
+ 
+-aix4* | aix5*)
++aix[[4-9]]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -3746,6 +3842,7 @@ _LT_AC_TAGVAR(postdep_objects, $1)=
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+ 
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -3855,7 +3952,7 @@ case $host_os in
+     # FIXME: insert proper C++ library support
+     _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  aix4* | aix5*)
++  aix[[4-9]]*)
+     if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+@@ -3868,7 +3965,7 @@ case $host_os in
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+@@ -4014,51 +4111,23 @@ case $host_os in
+     fi
+   ;;
+       darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[[012]])
+-         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[[012]])
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+       _LT_AC_TAGVAR(hardcode_direct, $1)=no
+       _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++      if test "$GXX" = yes ; then
+       output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
++      _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++      _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+       fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       else
+       case $cc_basename in
+         xlc*)
+@@ -4309,7 +4378,7 @@ case $host_os in
+ 	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      pgCC*)
++      pgCC* | pgcpp*)
+         # Portland Group C++ compiler
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+   	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -4382,7 +4451,7 @@ case $host_os in
+ 	;;
+     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=
+@@ -4744,7 +4813,8 @@ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library.  It's possible we should let each
+@@ -4869,6 +4939,11 @@ fi
+ 
+ $rm -f confest.$objext
+ 
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++  _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+@@ -4925,7 +5000,6 @@ solaris*)
+   ;;
+ esac
+ ])
+-
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -5010,7 +5084,7 @@ aix3*)
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4* | aix5*)
++aix[[4-9]]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -5187,6 +5261,7 @@ if test -f "$ltmain"; then
+     _LT_AC_TAGVAR(predeps, $1) \
+     _LT_AC_TAGVAR(postdeps, $1) \
+     _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+     _LT_AC_TAGVAR(archive_cmds, $1) \
+     _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+     _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -5249,7 +5324,7 @@ ifelse([$1], [],
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5486,6 +5561,10 @@ predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -5835,7 +5914,7 @@ EOF
+     echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+     cat conftest.$ac_ext >&5
+   fi
+-  rm -f conftest* conftst*
++  rm -rf conftest* conftst*
+ 
+   # Do not use the global_symbol_pipe unless it works.
+   if test "$pipe_works" = yes; then
+@@ -5892,7 +5971,8 @@ AC_MSG_CHECKING([for $compiler option to
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+       # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+       ;;
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+@@ -5929,7 +6009,7 @@ AC_MSG_CHECKING([for $compiler option to
+     esac
+   else
+     case $host_os in
+-      aix4* | aix5*)
++      aix[[4-9]]*)
+ 	# All AIX code is PIC.
+ 	if test "$host_cpu" = ia64; then
+ 	  # AIX 5 now supports IA64 processor
+@@ -6025,7 +6105,7 @@ AC_MSG_CHECKING([for $compiler option to
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ 	    ;;
+-	  pgCC*)
++	  pgCC* | pgcpp*)
+ 	    # Portland Group C++ compiler.
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+@@ -6063,7 +6143,7 @@ AC_MSG_CHECKING([for $compiler option to
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -6176,7 +6256,8 @@ AC_MSG_CHECKING([for $compiler option to
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+       # (--disable-auto-import) libraries
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+       ;;
+ 
+     darwin* | rhapsody*)
+@@ -6246,7 +6327,8 @@ AC_MSG_CHECKING([for $compiler option to
+     mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      m4_if([$1], [GCJ], [],
++	[_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+       ;;
+ 
+     hpux9* | hpux10* | hpux11*)
+@@ -6383,7 +6465,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_co
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+   AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+     [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+     [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+      "" | " "*) ;;
+@@ -6407,7 +6489,7 @@ esac
+ #
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+   $lt_tmp_static_flag,
+   [],
+   [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+@@ -6423,7 +6505,7 @@ AC_MSG_CHECKING([whether the $compiler l
+ ifelse([$1],[CXX],[
+   _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+-  aix4* | aix5*)
++  aix[[4-9]]*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -6438,10 +6520,14 @@ ifelse([$1],[CXX],[
+   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
++  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+   runpath_var=
+   _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -6472,12 +6558,14 @@ ifelse([$1],[CXX],[
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++  _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   _LT_CC_BASENAME([$compiler])
+@@ -6527,7 +6615,7 @@ ifelse([$1],[CXX],[
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[[3-9]]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	_LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -6643,12 +6731,13 @@ EOF
+   $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
++	_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=
+@@ -6746,7 +6835,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[[4-9]]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -6766,7 +6855,7 @@ _LT_EOF
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -6926,11 +7015,10 @@ _LT_EOF
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+@@ -7080,7 +7168,7 @@ _LT_EOF
+       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+diff -Nurp totem-2.22.1.orig/bindings/Makefile.in totem-2.22.1/bindings/Makefile.in
+--- totem-2.22.1.orig/bindings/Makefile.in	2010-06-24 20:44:31.380103454 +0000
++++ totem-2.22.1/bindings/Makefile.in	2010-06-24 20:44:44.220135851 +0000
+@@ -94,7 +94,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -110,6 +112,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -191,6 +195,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/bindings/python/Makefile.in totem-2.22.1/bindings/python/Makefile.in
+--- totem-2.22.1.orig/bindings/python/Makefile.in	2010-06-24 20:44:31.390116738 +0000
++++ totem-2.22.1/bindings/python/Makefile.in	2010-06-24 20:44:44.342567680 +0000
+@@ -107,7 +107,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -123,6 +125,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -204,6 +208,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/bindings/vala/Makefile.in totem-2.22.1/bindings/vala/Makefile.in
+--- totem-2.22.1.orig/bindings/vala/Makefile.in	2010-06-24 20:44:31.380103454 +0000
++++ totem-2.22.1/bindings/vala/Makefile.in	2010-06-24 20:44:44.430094585 +0000
+@@ -83,7 +83,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -99,6 +101,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -180,6 +184,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/browser-plugin/Makefile.in totem-2.22.1/browser-plugin/Makefile.in
+--- totem-2.22.1.orig/browser-plugin/Makefile.in	2010-06-24 20:44:31.420087028 +0000
++++ totem-2.22.1/browser-plugin/Makefile.in	2010-06-24 20:44:44.742572641 +0000
+@@ -77,12 +77,17 @@ am__DEPENDENCIES_1 =
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+-am__libtotem_basic_plugin_la_SOURCES_DIST = totemDebug.h \
+-	totemPluginGlue.cpp totemPluginGlue.h totemPlugin.cpp \
+-	totemPlugin.h totemStringGlue.h totemBasicPlugin.cpp \
+-	totemBasicPlugin.h totemClassInfo.h \
++am__libtotem_basic_plugin_la_SOURCES_DIST = totemNPNGlue.cpp \
++	totemNPClass.cpp totemNPClass.h totemNPObject.cpp \
++	totemNPObject.h totemNPObjectWrapper.h totemNPVariantWrapper.h \
++	totemDebug.h totemPluginGlue.cpp totemPluginGlue.h \
++	totemPlugin.cpp totemPlugin.h totemStringGlue.h \
++	totemBasicPlugin.cpp totemBasicPlugin.h totemClassInfo.h \
+ 	totem-plugin-viewer-constants.h
+-@ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_OBJECTS = libtotem_basic_plugin_la-totemPluginGlue.lo \
++@ENABLE_BASIC_PLUGIN_TRUE@am_libtotem_basic_plugin_la_OBJECTS = libtotem_basic_plugin_la-totemNPNGlue.lo \
++@ENABLE_BASIC_PLUGIN_TRUE@	libtotem_basic_plugin_la-totemNPClass.lo \
++@ENABLE_BASIC_PLUGIN_TRUE@	libtotem_basic_plugin_la-totemNPObject.lo \
++@ENABLE_BASIC_PLUGIN_TRUE@	libtotem_basic_plugin_la-totemPluginGlue.lo \
+ @ENABLE_BASIC_PLUGIN_TRUE@	libtotem_basic_plugin_la-totemPlugin.lo \
+ @ENABLE_BASIC_PLUGIN_TRUE@	libtotem_basic_plugin_la-totemBasicPlugin.lo
+ libtotem_basic_plugin_la_OBJECTS =  \
+@@ -98,12 +103,17 @@ libtotem_basic_plugin_la_LINK = $(LIBTOO
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+-am__libtotem_complex_plugin_la_SOURCES_DIST = totemDebug.h \
+-	totemPluginGlue.cpp totemPluginGlue.h totemPlugin.cpp \
+-	totemPlugin.h totemStringGlue.h totemComplexPlugin.cpp \
+-	totemComplexPlugin.h totemClassInfo.h \
++am__libtotem_complex_plugin_la_SOURCES_DIST = totemNPNGlue.cpp \
++	totemNPClass.cpp totemNPClass.h totemNPObject.cpp \
++	totemNPObject.h totemNPObjectWrapper.h totemNPVariantWrapper.h \
++	totemDebug.h totemPluginGlue.cpp totemPluginGlue.h \
++	totemPlugin.cpp totemPlugin.h totemStringGlue.h \
++	totemComplexPlugin.cpp totemComplexPlugin.h totemClassInfo.h \
+ 	totem-plugin-viewer-constants.h
+-@ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_OBJECTS = libtotem_complex_plugin_la-totemPluginGlue.lo \
++@ENABLE_COMPLEX_PLUGIN_TRUE@am_libtotem_complex_plugin_la_OBJECTS = libtotem_complex_plugin_la-totemNPNGlue.lo \
++@ENABLE_COMPLEX_PLUGIN_TRUE@	libtotem_complex_plugin_la-totemNPClass.lo \
++@ENABLE_COMPLEX_PLUGIN_TRUE@	libtotem_complex_plugin_la-totemNPObject.lo \
++@ENABLE_COMPLEX_PLUGIN_TRUE@	libtotem_complex_plugin_la-totemPluginGlue.lo \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotem_complex_plugin_la-totemPlugin.lo \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	libtotem_complex_plugin_la-totemComplexPlugin.lo
+ libtotem_complex_plugin_la_OBJECTS =  \
+@@ -119,12 +129,17 @@ libtotem_complex_plugin_la_LINK = $(LIBT
+ @ENABLE_CONE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_CONE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_CONE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+-am__libtotem_cone_plugin_la_SOURCES_DIST = totemDebug.h \
+-	totemPluginGlue.cpp totemPluginGlue.h totemPlugin.cpp \
+-	totemPlugin.h totemStringGlue.h totemConePlugin.cpp \
+-	totemConePlugin.h totemClassInfo.h \
++am__libtotem_cone_plugin_la_SOURCES_DIST = totemNPNGlue.cpp \
++	totemNPClass.cpp totemNPClass.h totemNPObject.cpp \
++	totemNPObject.h totemNPObjectWrapper.h totemNPVariantWrapper.h \
++	totemDebug.h totemPluginGlue.cpp totemPluginGlue.h \
++	totemPlugin.cpp totemPlugin.h totemStringGlue.h \
++	totemConePlugin.cpp totemConePlugin.h totemClassInfo.h \
+ 	totem-plugin-viewer-constants.h
+-@ENABLE_CONE_PLUGIN_TRUE@am_libtotem_cone_plugin_la_OBJECTS = libtotem_cone_plugin_la-totemPluginGlue.lo \
++@ENABLE_CONE_PLUGIN_TRUE@am_libtotem_cone_plugin_la_OBJECTS = libtotem_cone_plugin_la-totemNPNGlue.lo \
++@ENABLE_CONE_PLUGIN_TRUE@	libtotem_cone_plugin_la-totemNPClass.lo \
++@ENABLE_CONE_PLUGIN_TRUE@	libtotem_cone_plugin_la-totemNPObject.lo \
++@ENABLE_CONE_PLUGIN_TRUE@	libtotem_cone_plugin_la-totemPluginGlue.lo \
+ @ENABLE_CONE_PLUGIN_TRUE@	libtotem_cone_plugin_la-totemPlugin.lo \
+ @ENABLE_CONE_PLUGIN_TRUE@	libtotem_cone_plugin_la-totemConePlugin.lo
+ libtotem_cone_plugin_la_OBJECTS =  \
+@@ -140,14 +155,19 @@ libtotem_cone_plugin_la_LINK = $(LIBTOOL
+ @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+-am__libtotem_gmp_plugin_la_SOURCES_DIST = totemDebug.h \
+-	totemGMPError.cpp totemGMPError.h totemGMPPlaylist.cpp \
+-	totemGMPPlaylist.h totemGMPSettings.cpp totemGMPSettings.h \
+-	totemPluginGlue.cpp totemPluginGlue.h totemPlugin.cpp \
+-	totemPlugin.h totemStringGlue.h totemGMPPlugin.cpp \
+-	totemGMPPlugin.h totemClassInfo.h \
++am__libtotem_gmp_plugin_la_SOURCES_DIST = totemNPNGlue.cpp \
++	totemNPClass.cpp totemNPClass.h totemNPObject.cpp \
++	totemNPObject.h totemNPObjectWrapper.h totemNPVariantWrapper.h \
++	totemDebug.h totemGMPError.cpp totemGMPError.h \
++	totemGMPPlaylist.cpp totemGMPPlaylist.h totemGMPSettings.cpp \
++	totemGMPSettings.h totemPluginGlue.cpp totemPluginGlue.h \
++	totemPlugin.cpp totemPlugin.h totemStringGlue.h \
++	totemGMPPlugin.cpp totemGMPPlugin.h totemClassInfo.h \
+ 	totem-plugin-viewer-constants.h
+-@ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_OBJECTS = libtotem_gmp_plugin_la-totemGMPError.lo \
++@ENABLE_GMP_PLUGIN_TRUE@am_libtotem_gmp_plugin_la_OBJECTS = libtotem_gmp_plugin_la-totemNPNGlue.lo \
++@ENABLE_GMP_PLUGIN_TRUE@	libtotem_gmp_plugin_la-totemNPClass.lo \
++@ENABLE_GMP_PLUGIN_TRUE@	libtotem_gmp_plugin_la-totemNPObject.lo \
++@ENABLE_GMP_PLUGIN_TRUE@	libtotem_gmp_plugin_la-totemGMPError.lo \
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotem_gmp_plugin_la-totemGMPPlaylist.lo \
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotem_gmp_plugin_la-totemGMPSettings.lo \
+ @ENABLE_GMP_PLUGIN_TRUE@	libtotem_gmp_plugin_la-totemPluginGlue.lo \
+@@ -165,12 +185,17 @@ libtotem_gmp_plugin_la_LINK = $(LIBTOOL)
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+-am__libtotem_mully_plugin_la_SOURCES_DIST = totemDebug.h \
+-	totemPluginGlue.cpp totemPluginGlue.h totemPlugin.cpp \
+-	totemPlugin.h totemStringGlue.h totemMullYPlugin.cpp \
+-	totemMullYPlugin.h totemClassInfo.h \
++am__libtotem_mully_plugin_la_SOURCES_DIST = totemNPNGlue.cpp \
++	totemNPClass.cpp totemNPClass.h totemNPObject.cpp \
++	totemNPObject.h totemNPObjectWrapper.h totemNPVariantWrapper.h \
++	totemDebug.h totemPluginGlue.cpp totemPluginGlue.h \
++	totemPlugin.cpp totemPlugin.h totemStringGlue.h \
++	totemMullYPlugin.cpp totemMullYPlugin.h totemClassInfo.h \
+ 	totem-plugin-viewer-constants.h
+-@ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_OBJECTS = libtotem_mully_plugin_la-totemPluginGlue.lo \
++@ENABLE_MULLY_PLUGIN_TRUE@am_libtotem_mully_plugin_la_OBJECTS = libtotem_mully_plugin_la-totemNPNGlue.lo \
++@ENABLE_MULLY_PLUGIN_TRUE@	libtotem_mully_plugin_la-totemNPClass.lo \
++@ENABLE_MULLY_PLUGIN_TRUE@	libtotem_mully_plugin_la-totemNPObject.lo \
++@ENABLE_MULLY_PLUGIN_TRUE@	libtotem_mully_plugin_la-totemPluginGlue.lo \
+ @ENABLE_MULLY_PLUGIN_TRUE@	libtotem_mully_plugin_la-totemPlugin.lo \
+ @ENABLE_MULLY_PLUGIN_TRUE@	libtotem_mully_plugin_la-totemMullYPlugin.lo
+ libtotem_mully_plugin_la_OBJECTS =  \
+@@ -185,12 +210,17 @@ libtotem_mully_plugin_la_LINK = $(LIBTOO
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1) \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(am__DEPENDENCIES_1)
+-am__libtotem_narrowspace_plugin_la_SOURCES_DIST = totemDebug.h \
+-	totemPluginGlue.cpp totemPluginGlue.h totemPlugin.cpp \
+-	totemPlugin.h totemStringGlue.h totemNarrowSpacePlugin.cpp \
+-	totemNarrowSpacePlugin.h totemClassInfo.h \
+-	totem-plugin-viewer-constants.h
+-@ENABLE_NARROWSPACE_PLUGIN_TRUE@am_libtotem_narrowspace_plugin_la_OBJECTS = libtotem_narrowspace_plugin_la-totemPluginGlue.lo \
++am__libtotem_narrowspace_plugin_la_SOURCES_DIST = totemNPNGlue.cpp \
++	totemNPClass.cpp totemNPClass.h totemNPObject.cpp \
++	totemNPObject.h totemNPObjectWrapper.h totemNPVariantWrapper.h \
++	totemDebug.h totemPluginGlue.cpp totemPluginGlue.h \
++	totemPlugin.cpp totemPlugin.h totemStringGlue.h \
++	totemNarrowSpacePlugin.cpp totemNarrowSpacePlugin.h \
++	totemClassInfo.h totem-plugin-viewer-constants.h
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@am_libtotem_narrowspace_plugin_la_OBJECTS = libtotem_narrowspace_plugin_la-totemNPNGlue.lo \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotem_narrowspace_plugin_la-totemNPClass.lo \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotem_narrowspace_plugin_la-totemNPObject.lo \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotem_narrowspace_plugin_la-totemPluginGlue.lo \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotem_narrowspace_plugin_la-totemPlugin.lo \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	libtotem_narrowspace_plugin_la-totemNarrowSpacePlugin.lo
+ libtotem_narrowspace_plugin_la_OBJECTS =  \
+@@ -232,7 +262,8 @@ totem_plugin_viewer_DEPENDENCIES =  \
+ 	libtotempluginviewer_helper.la $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1)
+ totem_plugin_viewer_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ 	$(totem_plugin_viewer_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+@@ -324,7 +355,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -340,6 +373,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -421,6 +456,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+@@ -623,6 +659,7 @@ totem_plugin_viewer_CFLAGS = \
+ 	$(DBUS_CFLAGS)		\
+ 	$(NVTV_CFLAGS)		\
+ 	$(SN_CFLAGS)		\
++	$(GIO_CFLAGS)		\
+ 	$(AM_CFLAGS)
+ 
+ totem_plugin_viewer_LDADD = \
+@@ -636,9 +673,17 @@ totem_plugin_viewer_LDADD = \
+ 	$(DBUS_LIBS)		\
+ 	$(NVTV_LIBS) 		\
+ 	$(XTEST_LIBS)		\
+-	$(X_LIBS)
++	$(X_LIBS)		\
++	$(GIO_LIBS)
+ 
+ @ENABLE_BASIC_PLUGIN_TRUE@libtotem_basic_plugin_la_SOURCES = \
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPNGlue.cpp		\
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPClass.cpp		\
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPClass.h			\
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPObject.cpp		\
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPObject.h			\
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPObjectWrapper.h		\
++@ENABLE_BASIC_PLUGIN_TRUE@	totemNPVariantWrapper.h		\
+ @ENABLE_BASIC_PLUGIN_TRUE@	totemDebug.h			\
+ @ENABLE_BASIC_PLUGIN_TRUE@	totemPluginGlue.cpp		\
+ @ENABLE_BASIC_PLUGIN_TRUE@	totemPluginGlue.h		\
+@@ -691,6 +736,13 @@ totem_plugin_viewer_LDADD = \
+ @ENABLE_BASIC_PLUGIN_TRUE@	$(AM_LDFLAGS)
+ 
+ @ENABLE_GMP_PLUGIN_TRUE@libtotem_gmp_plugin_la_SOURCES = \
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPNGlue.cpp		\
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPClass.cpp		\
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPClass.h			\
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPObject.cpp		\
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPObject.h			\
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPObjectWrapper.h		\
++@ENABLE_GMP_PLUGIN_TRUE@	totemNPVariantWrapper.h		\
+ @ENABLE_GMP_PLUGIN_TRUE@	totemDebug.h			\
+ @ENABLE_GMP_PLUGIN_TRUE@	totemGMPError.cpp		\
+ @ENABLE_GMP_PLUGIN_TRUE@	totemGMPError.h			\
+@@ -749,6 +801,13 @@ totem_plugin_viewer_LDADD = \
+ @ENABLE_GMP_PLUGIN_TRUE@	$(AM_LDFLAGS)
+ 
+ @ENABLE_COMPLEX_PLUGIN_TRUE@libtotem_complex_plugin_la_SOURCES = \
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPNGlue.cpp		\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPClass.cpp		\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPClass.h			\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPObject.cpp		\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPObject.h			\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPObjectWrapper.h		\
++@ENABLE_COMPLEX_PLUGIN_TRUE@	totemNPVariantWrapper.h		\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	totemDebug.h			\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	totemPluginGlue.cpp		\
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	totemPluginGlue.h		\
+@@ -801,6 +860,13 @@ totem_plugin_viewer_LDADD = \
+ @ENABLE_COMPLEX_PLUGIN_TRUE@	$(AM_LDFLAGS)
+ 
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@libtotem_narrowspace_plugin_la_SOURCES = \
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPNGlue.cpp		\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPClass.cpp		\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPClass.h			\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPObject.cpp		\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPObject.h			\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPObjectWrapper.h		\
++@ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemNPVariantWrapper.h		\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemDebug.h			\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemPluginGlue.cpp		\
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	totemPluginGlue.h		\
+@@ -853,6 +919,13 @@ totem_plugin_viewer_LDADD = \
+ @ENABLE_NARROWSPACE_PLUGIN_TRUE@	$(AM_LDFLAGS)
+ 
+ @ENABLE_MULLY_PLUGIN_TRUE@libtotem_mully_plugin_la_SOURCES = \
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPNGlue.cpp		\
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPClass.cpp		\
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPClass.h			\
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPObject.cpp		\
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPObject.h			\
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPObjectWrapper.h		\
++@ENABLE_MULLY_PLUGIN_TRUE@	totemNPVariantWrapper.h		\
+ @ENABLE_MULLY_PLUGIN_TRUE@	totemDebug.h			\
+ @ENABLE_MULLY_PLUGIN_TRUE@	totemPluginGlue.cpp		\
+ @ENABLE_MULLY_PLUGIN_TRUE@	totemPluginGlue.h		\
+@@ -905,6 +978,13 @@ totem_plugin_viewer_LDADD = \
+ @ENABLE_MULLY_PLUGIN_TRUE@	$(AM_LDFLAGS)
+ 
+ @ENABLE_CONE_PLUGIN_TRUE@libtotem_cone_plugin_la_SOURCES = \
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPNGlue.cpp		\
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPClass.cpp		\
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPClass.h			\
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPObject.cpp		\
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPObject.h			\
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPObjectWrapper.h		\
++@ENABLE_CONE_PLUGIN_TRUE@	totemNPVariantWrapper.h		\
+ @ENABLE_CONE_PLUGIN_TRUE@	totemDebug.h			\
+ @ENABLE_CONE_PLUGIN_TRUE@	totemPluginGlue.cpp		\
+ @ENABLE_CONE_PLUGIN_TRUE@	totemPluginGlue.h		\
+@@ -1089,23 +1169,41 @@ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_basic_plugin_la-totemBasicPlugin.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_basic_plugin_la-totemNPClass.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_basic_plugin_la-totemNPNGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_basic_plugin_la-totemNPObject.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_basic_plugin_la-totemPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_basic_plugin_la-totemPluginGlue.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_complex_plugin_la-totemComplexPlugin.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_complex_plugin_la-totemNPClass.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_complex_plugin_la-totemNPNGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_complex_plugin_la-totemNPObject.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_complex_plugin_la-totemPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_complex_plugin_la-totemPluginGlue.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_cone_plugin_la-totemConePlugin.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_cone_plugin_la-totemNPClass.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_cone_plugin_la-totemNPNGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_cone_plugin_la-totemNPObject.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_cone_plugin_la-totemPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_cone_plugin_la-totemPluginGlue.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemGMPError.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemGMPPlaylist.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemGMPPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemGMPSettings.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemNPClass.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemNPNGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemNPObject.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_gmp_plugin_la-totemPluginGlue.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_mully_plugin_la-totemMullYPlugin.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_mully_plugin_la-totemNPClass.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_mully_plugin_la-totemNPNGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_mully_plugin_la-totemNPObject.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_mully_plugin_la-totemPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_mully_plugin_la-totemPluginGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPClass.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPNGlue.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPObject.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_narrowspace_plugin_la-totemNarrowSpacePlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_narrowspace_plugin_la-totemPlugin.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtotem_narrowspace_plugin_la-totemPluginGlue.Plo@am__quote@
+@@ -1204,6 +1302,27 @@ totem_plugin_viewer-totem-plugin-viewer.
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
+ 
++libtotem_basic_plugin_la-totemNPNGlue.lo: totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_basic_plugin_la-totemNPNGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_basic_plugin_la-totemNPNGlue.Tpo -c -o libtotem_basic_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_basic_plugin_la-totemNPNGlue.Tpo $(DEPDIR)/libtotem_basic_plugin_la-totemNPNGlue.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPNGlue.cpp' object='libtotem_basic_plugin_la-totemNPNGlue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_basic_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++
++libtotem_basic_plugin_la-totemNPClass.lo: totemNPClass.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_basic_plugin_la-totemNPClass.lo -MD -MP -MF $(DEPDIR)/libtotem_basic_plugin_la-totemNPClass.Tpo -c -o libtotem_basic_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_basic_plugin_la-totemNPClass.Tpo $(DEPDIR)/libtotem_basic_plugin_la-totemNPClass.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPClass.cpp' object='libtotem_basic_plugin_la-totemNPClass.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_basic_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++
++libtotem_basic_plugin_la-totemNPObject.lo: totemNPObject.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_basic_plugin_la-totemNPObject.lo -MD -MP -MF $(DEPDIR)/libtotem_basic_plugin_la-totemNPObject.Tpo -c -o libtotem_basic_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_basic_plugin_la-totemNPObject.Tpo $(DEPDIR)/libtotem_basic_plugin_la-totemNPObject.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPObject.cpp' object='libtotem_basic_plugin_la-totemNPObject.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_basic_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++
+ libtotem_basic_plugin_la-totemPluginGlue.lo: totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_basic_plugin_la-totemPluginGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_basic_plugin_la-totemPluginGlue.Tpo -c -o libtotem_basic_plugin_la-totemPluginGlue.lo `test -f 'totemPluginGlue.cpp' || echo '$(srcdir)/'`totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_basic_plugin_la-totemPluginGlue.Tpo $(DEPDIR)/libtotem_basic_plugin_la-totemPluginGlue.Plo
+@@ -1225,6 +1344,27 @@ libtotem_basic_plugin_la-totemBasicPlugi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_basic_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_basic_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_basic_plugin_la-totemBasicPlugin.lo `test -f 'totemBasicPlugin.cpp' || echo '$(srcdir)/'`totemBasicPlugin.cpp
+ 
++libtotem_complex_plugin_la-totemNPNGlue.lo: totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_complex_plugin_la-totemNPNGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_complex_plugin_la-totemNPNGlue.Tpo -c -o libtotem_complex_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_complex_plugin_la-totemNPNGlue.Tpo $(DEPDIR)/libtotem_complex_plugin_la-totemNPNGlue.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPNGlue.cpp' object='libtotem_complex_plugin_la-totemNPNGlue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_complex_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++
++libtotem_complex_plugin_la-totemNPClass.lo: totemNPClass.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_complex_plugin_la-totemNPClass.lo -MD -MP -MF $(DEPDIR)/libtotem_complex_plugin_la-totemNPClass.Tpo -c -o libtotem_complex_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_complex_plugin_la-totemNPClass.Tpo $(DEPDIR)/libtotem_complex_plugin_la-totemNPClass.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPClass.cpp' object='libtotem_complex_plugin_la-totemNPClass.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_complex_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++
++libtotem_complex_plugin_la-totemNPObject.lo: totemNPObject.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_complex_plugin_la-totemNPObject.lo -MD -MP -MF $(DEPDIR)/libtotem_complex_plugin_la-totemNPObject.Tpo -c -o libtotem_complex_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_complex_plugin_la-totemNPObject.Tpo $(DEPDIR)/libtotem_complex_plugin_la-totemNPObject.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPObject.cpp' object='libtotem_complex_plugin_la-totemNPObject.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_complex_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++
+ libtotem_complex_plugin_la-totemPluginGlue.lo: totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_complex_plugin_la-totemPluginGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_complex_plugin_la-totemPluginGlue.Tpo -c -o libtotem_complex_plugin_la-totemPluginGlue.lo `test -f 'totemPluginGlue.cpp' || echo '$(srcdir)/'`totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_complex_plugin_la-totemPluginGlue.Tpo $(DEPDIR)/libtotem_complex_plugin_la-totemPluginGlue.Plo
+@@ -1246,6 +1386,27 @@ libtotem_complex_plugin_la-totemComplexP
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_complex_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_complex_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_complex_plugin_la-totemComplexPlugin.lo `test -f 'totemComplexPlugin.cpp' || echo '$(srcdir)/'`totemComplexPlugin.cpp
+ 
++libtotem_cone_plugin_la-totemNPNGlue.lo: totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_cone_plugin_la-totemNPNGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_cone_plugin_la-totemNPNGlue.Tpo -c -o libtotem_cone_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_cone_plugin_la-totemNPNGlue.Tpo $(DEPDIR)/libtotem_cone_plugin_la-totemNPNGlue.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPNGlue.cpp' object='libtotem_cone_plugin_la-totemNPNGlue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_cone_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++
++libtotem_cone_plugin_la-totemNPClass.lo: totemNPClass.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_cone_plugin_la-totemNPClass.lo -MD -MP -MF $(DEPDIR)/libtotem_cone_plugin_la-totemNPClass.Tpo -c -o libtotem_cone_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_cone_plugin_la-totemNPClass.Tpo $(DEPDIR)/libtotem_cone_plugin_la-totemNPClass.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPClass.cpp' object='libtotem_cone_plugin_la-totemNPClass.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_cone_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++
++libtotem_cone_plugin_la-totemNPObject.lo: totemNPObject.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_cone_plugin_la-totemNPObject.lo -MD -MP -MF $(DEPDIR)/libtotem_cone_plugin_la-totemNPObject.Tpo -c -o libtotem_cone_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_cone_plugin_la-totemNPObject.Tpo $(DEPDIR)/libtotem_cone_plugin_la-totemNPObject.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPObject.cpp' object='libtotem_cone_plugin_la-totemNPObject.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_cone_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++
+ libtotem_cone_plugin_la-totemPluginGlue.lo: totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_cone_plugin_la-totemPluginGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_cone_plugin_la-totemPluginGlue.Tpo -c -o libtotem_cone_plugin_la-totemPluginGlue.lo `test -f 'totemPluginGlue.cpp' || echo '$(srcdir)/'`totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_cone_plugin_la-totemPluginGlue.Tpo $(DEPDIR)/libtotem_cone_plugin_la-totemPluginGlue.Plo
+@@ -1267,6 +1428,27 @@ libtotem_cone_plugin_la-totemConePlugin.
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_cone_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_cone_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_cone_plugin_la-totemConePlugin.lo `test -f 'totemConePlugin.cpp' || echo '$(srcdir)/'`totemConePlugin.cpp
+ 
++libtotem_gmp_plugin_la-totemNPNGlue.lo: totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_gmp_plugin_la-totemNPNGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_gmp_plugin_la-totemNPNGlue.Tpo -c -o libtotem_gmp_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_gmp_plugin_la-totemNPNGlue.Tpo $(DEPDIR)/libtotem_gmp_plugin_la-totemNPNGlue.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPNGlue.cpp' object='libtotem_gmp_plugin_la-totemNPNGlue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_gmp_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++
++libtotem_gmp_plugin_la-totemNPClass.lo: totemNPClass.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_gmp_plugin_la-totemNPClass.lo -MD -MP -MF $(DEPDIR)/libtotem_gmp_plugin_la-totemNPClass.Tpo -c -o libtotem_gmp_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_gmp_plugin_la-totemNPClass.Tpo $(DEPDIR)/libtotem_gmp_plugin_la-totemNPClass.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPClass.cpp' object='libtotem_gmp_plugin_la-totemNPClass.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_gmp_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++
++libtotem_gmp_plugin_la-totemNPObject.lo: totemNPObject.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_gmp_plugin_la-totemNPObject.lo -MD -MP -MF $(DEPDIR)/libtotem_gmp_plugin_la-totemNPObject.Tpo -c -o libtotem_gmp_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_gmp_plugin_la-totemNPObject.Tpo $(DEPDIR)/libtotem_gmp_plugin_la-totemNPObject.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPObject.cpp' object='libtotem_gmp_plugin_la-totemNPObject.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_gmp_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++
+ libtotem_gmp_plugin_la-totemGMPError.lo: totemGMPError.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_gmp_plugin_la-totemGMPError.lo -MD -MP -MF $(DEPDIR)/libtotem_gmp_plugin_la-totemGMPError.Tpo -c -o libtotem_gmp_plugin_la-totemGMPError.lo `test -f 'totemGMPError.cpp' || echo '$(srcdir)/'`totemGMPError.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_gmp_plugin_la-totemGMPError.Tpo $(DEPDIR)/libtotem_gmp_plugin_la-totemGMPError.Plo
+@@ -1309,6 +1491,27 @@ libtotem_gmp_plugin_la-totemGMPPlugin.lo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_gmp_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_gmp_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_gmp_plugin_la-totemGMPPlugin.lo `test -f 'totemGMPPlugin.cpp' || echo '$(srcdir)/'`totemGMPPlugin.cpp
+ 
++libtotem_mully_plugin_la-totemNPNGlue.lo: totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_mully_plugin_la-totemNPNGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_mully_plugin_la-totemNPNGlue.Tpo -c -o libtotem_mully_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_mully_plugin_la-totemNPNGlue.Tpo $(DEPDIR)/libtotem_mully_plugin_la-totemNPNGlue.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPNGlue.cpp' object='libtotem_mully_plugin_la-totemNPNGlue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_mully_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++
++libtotem_mully_plugin_la-totemNPClass.lo: totemNPClass.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_mully_plugin_la-totemNPClass.lo -MD -MP -MF $(DEPDIR)/libtotem_mully_plugin_la-totemNPClass.Tpo -c -o libtotem_mully_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_mully_plugin_la-totemNPClass.Tpo $(DEPDIR)/libtotem_mully_plugin_la-totemNPClass.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPClass.cpp' object='libtotem_mully_plugin_la-totemNPClass.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_mully_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++
++libtotem_mully_plugin_la-totemNPObject.lo: totemNPObject.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_mully_plugin_la-totemNPObject.lo -MD -MP -MF $(DEPDIR)/libtotem_mully_plugin_la-totemNPObject.Tpo -c -o libtotem_mully_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_mully_plugin_la-totemNPObject.Tpo $(DEPDIR)/libtotem_mully_plugin_la-totemNPObject.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPObject.cpp' object='libtotem_mully_plugin_la-totemNPObject.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_mully_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++
+ libtotem_mully_plugin_la-totemPluginGlue.lo: totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_mully_plugin_la-totemPluginGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_mully_plugin_la-totemPluginGlue.Tpo -c -o libtotem_mully_plugin_la-totemPluginGlue.lo `test -f 'totemPluginGlue.cpp' || echo '$(srcdir)/'`totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_mully_plugin_la-totemPluginGlue.Tpo $(DEPDIR)/libtotem_mully_plugin_la-totemPluginGlue.Plo
+@@ -1330,6 +1533,27 @@ libtotem_mully_plugin_la-totemMullYPlugi
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_mully_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_mully_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_mully_plugin_la-totemMullYPlugin.lo `test -f 'totemMullYPlugin.cpp' || echo '$(srcdir)/'`totemMullYPlugin.cpp
+ 
++libtotem_narrowspace_plugin_la-totemNPNGlue.lo: totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_narrowspace_plugin_la-totemNPNGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPNGlue.Tpo -c -o libtotem_narrowspace_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPNGlue.Tpo $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPNGlue.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPNGlue.cpp' object='libtotem_narrowspace_plugin_la-totemNPNGlue.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_narrowspace_plugin_la-totemNPNGlue.lo `test -f 'totemNPNGlue.cpp' || echo '$(srcdir)/'`totemNPNGlue.cpp
++
++libtotem_narrowspace_plugin_la-totemNPClass.lo: totemNPClass.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_narrowspace_plugin_la-totemNPClass.lo -MD -MP -MF $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPClass.Tpo -c -o libtotem_narrowspace_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPClass.Tpo $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPClass.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPClass.cpp' object='libtotem_narrowspace_plugin_la-totemNPClass.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_narrowspace_plugin_la-totemNPClass.lo `test -f 'totemNPClass.cpp' || echo '$(srcdir)/'`totemNPClass.cpp
++
++libtotem_narrowspace_plugin_la-totemNPObject.lo: totemNPObject.cpp
++@am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_narrowspace_plugin_la-totemNPObject.lo -MD -MP -MF $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPObject.Tpo -c -o libtotem_narrowspace_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPObject.Tpo $(DEPDIR)/libtotem_narrowspace_plugin_la-totemNPObject.Plo
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='totemNPObject.cpp' object='libtotem_narrowspace_plugin_la-totemNPObject.lo' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCXX_FALSE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -c -o libtotem_narrowspace_plugin_la-totemNPObject.lo `test -f 'totemNPObject.cpp' || echo '$(srcdir)/'`totemNPObject.cpp
++
+ libtotem_narrowspace_plugin_la-totemPluginGlue.lo: totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libtotem_narrowspace_plugin_la_CPPFLAGS) $(CPPFLAGS) $(libtotem_narrowspace_plugin_la_CXXFLAGS) $(CXXFLAGS) -MT libtotem_narrowspace_plugin_la-totemPluginGlue.lo -MD -MP -MF $(DEPDIR)/libtotem_narrowspace_plugin_la-totemPluginGlue.Tpo -c -o libtotem_narrowspace_plugin_la-totemPluginGlue.lo `test -f 'totemPluginGlue.cpp' || echo '$(srcdir)/'`totemPluginGlue.cpp
+ @am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/libtotem_narrowspace_plugin_la-totemPluginGlue.Tpo $(DEPDIR)/libtotem_narrowspace_plugin_la-totemPluginGlue.Plo
+diff -Nurp totem-2.22.1.orig/browser-plugin/idl/Makefile.in totem-2.22.1/browser-plugin/idl/Makefile.in
+--- totem-2.22.1.orig/browser-plugin/idl/Makefile.in	2010-06-24 20:44:31.470074527 +0000
++++ totem-2.22.1/browser-plugin/idl/Makefile.in	2010-06-24 20:44:44.852567623 +0000
+@@ -103,7 +103,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -119,6 +121,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -200,6 +204,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/configure totem-2.22.1/configure
+--- totem-2.22.1.orig/configure	2010-06-24 20:44:32.030100035 +0000
++++ totem-2.22.1/configure	2010-06-24 20:44:43.210067533 +0000
+@@ -895,6 +895,7 @@ OMF_DIR
+ DOC_USER_FORMATS
+ ENABLE_SK_TRUE
+ ENABLE_SK_FALSE
++DISTCHECK_CONFIGURE_FLAGS
+ HAVE_GNOME_DOC_UTILS_TRUE
+ HAVE_GNOME_DOC_UTILS_FALSE
+ CXX
+@@ -916,6 +917,8 @@ LN_S
+ ECHO
+ AR
+ RANLIB
++DSYMUTIL
++NMEDIT
+ CXXCPP
+ F77
+ FFLAGS
+@@ -943,6 +946,8 @@ HAVE_GNOME_TRUE
+ HAVE_GNOME_FALSE
+ GTK_CFLAGS
+ GTK_LIBS
++GIO_CFLAGS
++GIO_LIBS
+ PYTHON
+ PYTHON_VERSION
+ PYTHON_PREFIX
+@@ -1082,6 +1087,8 @@ EXTRA_GNOME_CFLAGS
+ EXTRA_GNOME_LIBS
+ GTK_CFLAGS
+ GTK_LIBS
++GIO_CFLAGS
++GIO_LIBS
+ PYGTK_CFLAGS
+ PYGTK_LIBS
+ VALA_CFLAGS
+@@ -1794,6 +1801,8 @@ Some influential environment variables:
+               linker flags for EXTRA_GNOME, overriding pkg-config
+   GTK_CFLAGS  C compiler flags for GTK, overriding pkg-config
+   GTK_LIBS    linker flags for GTK, overriding pkg-config
++  GIO_CFLAGS  C compiler flags for GIO, overriding pkg-config
++  GIO_LIBS    linker flags for GIO, overriding pkg-config
+   PYGTK_CFLAGS
+               C compiler flags for PYGTK, overriding pkg-config
+   PYGTK_LIBS  linker flags for PYGTK, overriding pkg-config
+@@ -6645,6 +6654,9 @@ else
+ fi
+ 
+ 
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++
++
+  if test "$gdu_cv_have_gdu" = "yes"; then
+   HAVE_GNOME_DOC_UTILS_TRUE=
+   HAVE_GNOME_DOC_UTILS_FALSE='#'
+@@ -7684,7 +7696,7 @@ lt_cv_deplibs_check_method='unknown'
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -7779,7 +7791,7 @@ 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
+@@ -7899,7 +7911,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7902 "configure"' > conftest.$ac_ext
++  echo '#line 7914 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -7964,7 +7976,6 @@ s390*-*linux*|sparc*-*linux*)
+       esac
+       ;;
+     *64-bit*)
+-      libsuff=64
+       case $host in
+         x86_64-*kfreebsd*-gnu)
+           LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -8072,7 +8083,11 @@ sparc*-*solaris*)
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+       yes*) LD="${LD-ld} -m elf64_sparc" ;;
+-      *)    LD="${LD-ld} -64" ;;
++      *)
++        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++	  LD="${LD-ld} -64"
++	fi
++	;;
+       esac
+       ;;
+     esac
+@@ -8728,7 +8743,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+ # find the maximum length of command line arguments
+ { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+@@ -9043,7 +9057,7 @@ EOF
+     echo "$progname: failed program was:" >&5
+     cat conftest.$ac_ext >&5
+   fi
+-  rm -f conftest* conftst*
++  rm -rf conftest* conftst*
+ 
+   # Do not use the global_symbol_pipe unless it works.
+   if test "$pipe_works" = yes; then
+@@ -9603,6 +9617,318 @@ fi
+   ;;
+ esac
+ 
++
++  case $host_os in
++    rhapsody* | darwin*)
++    if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dsymutil; 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_prog_DSYMUTIL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$DSYMUTIL"; then
++  ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++  ac_ct_DSYMUTIL=$DSYMUTIL
++  # Extract the first word of "dsymutil", so it can be a program name with args.
++set dummy dsymutil; 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_prog_ac_ct_DSYMUTIL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_DSYMUTIL"; then
++  ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++  if test "x$ac_ct_DSYMUTIL" = x; then
++    DSYMUTIL=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    DSYMUTIL=$ac_ct_DSYMUTIL
++  fi
++else
++  DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++fi
++
++    if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
++set dummy ${ac_tool_prefix}nmedit; 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_prog_NMEDIT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$NMEDIT"; then
++  ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_NMEDIT"; then
++  ac_ct_NMEDIT=$NMEDIT
++  # Extract the first word of "nmedit", so it can be a program name with args.
++set dummy nmedit; 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_prog_ac_ct_NMEDIT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_NMEDIT"; then
++  ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++    ac_cv_prog_ac_ct_NMEDIT="nmedit"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++  if test "x$ac_ct_NMEDIT" = x; then
++    NMEDIT=":"
++  else
++    case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet.  If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++    NMEDIT=$ac_ct_NMEDIT
++  fi
++else
++  NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_apple_cc_single_mod=no
++      if test -z "${LT_MULTI_MODULE}"; then
++   # By default we will add the -single_module flag. You can override
++   # by either setting the environment variable LT_MULTI_MODULE
++   # non-empty at configure time, or by adding -multi_module to the
++   # link flags.
++   echo "int foo(void){return 1;}" > conftest.c
++   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++     -dynamiclib ${wl}-single_module conftest.c
++   if test -f libconftest.dylib; then
++     lt_cv_apple_cc_single_mod=yes
++     rm -rf libconftest.dylib*
++   fi
++   rm conftest.c
++      fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_ld_exported_symbols_list=no
++      save_LDFLAGS=$LDFLAGS
++      echo "_main" > conftest.sym
++      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  lt_cv_ld_exported_symbols_list=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	lt_cv_ld_exported_symbols_list=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++    case $host_os in
++    rhapsody* | darwin1.[0123])
++      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++    darwin1.*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++    darwin*)
++      # if running on 10.5 or later, the deployment target defaults
++      # to the OS version, if on x86, and 10.4, the deployment
++      # target defaults to 10.4. Don't you love it?
++      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++   10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++   10.[012]*)
++     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++   10.*)
++     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++      esac
++    ;;
++  esac
++    if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++      _lt_dar_single_mod='$single_module'
++    fi
++    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++    else
++      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++    fi
++    if test "$DSYMUTIL" != ":"; then
++      _lt_dsymutil="~$DSYMUTIL \$lib || :"
++    else
++      _lt_dsymutil=
++    fi
++    ;;
++  esac
++
++
+ enable_dlopen=no
+ enable_win32_dll=no
+ 
+@@ -9668,7 +9994,7 @@ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ 
+@@ -9696,11 +10022,11 @@ else
+    -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:9699: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10025: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9703: \$? = $ac_status" >&5
++   echo "$as_me:10029: \$? = $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.
+@@ -9970,10 +10296,10 @@ if test -n "$lt_prog_compiler_pic"; then
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works=no
++  lt_cv_prog_compiler_pic_works=no
+   ac_outfile=conftest.$ac_objext
+    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+@@ -9986,27 +10312,27 @@ else
+    -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:9989: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10315: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9993: \$? = $ac_status" >&5
++   echo "$as_me:10319: \$? = $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
++       lt_cv_prog_compiler_pic_works=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+     case $lt_prog_compiler_pic in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -10033,10 +10359,10 @@ esac
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works=no
++  lt_cv_prog_compiler_static_works=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+    echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -10049,20 +10375,20 @@ else
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works=yes
++         lt_cv_prog_compiler_static_works=yes
+        fi
+      else
+-       lt_prog_compiler_static_works=yes
++       lt_cv_prog_compiler_static_works=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+     :
+ else
+     lt_prog_compiler_static=
+@@ -10090,11 +10416,11 @@ else
+    -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:10093: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10419: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:10097: \$? = $ac_status" >&5
++   echo "$as_me:10423: \$? = $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
+@@ -10174,12 +10500,13 @@ echo $ECHO_N "checking whether the $comp
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   for cc_temp in $compiler""; do
+@@ -10238,7 +10565,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	ld_shlibs=no
+@@ -10354,12 +10681,13 @@ EOF
+   $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
++	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=
+@@ -10457,7 +10785,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[4-9]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -10477,7 +10805,7 @@ _LT_EOF
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -10749,11 +11077,10 @@ if test -z "$aix_libpath"; then aix_libp
+       link_all_deplibs=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+@@ -10903,7 +11230,7 @@ if test -z "$aix_libpath"; then aix_libp
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11273,7 +11600,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -11598,13 +11925,11 @@ linux* | k*bsd*-gnu)
+   # 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
+@@ -11616,6 +11941,18 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++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*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -11797,6 +12134,21 @@ esac
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -12116,7 +12468,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+   { echo "$as_me:$LINENO: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+@@ -12392,7 +12744,7 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+ 
+ 
+@@ -12441,7 +12793,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12444 "configure"
++#line 12796 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12541,7 +12893,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 12544 "configure"
++#line 12896 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12668,7 +13020,7 @@ aix3*)
+   fi
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -12724,6 +13076,7 @@ if test -f "$ltmain"; then
+     predeps \
+     postdeps \
+     compiler_lib_search_path \
++    compiler_lib_search_dirs \
+     archive_cmds \
+     archive_expsym_cmds \
+     postinstall_cmds \
+@@ -12784,7 +13137,7 @@ echo "$as_me: creating $ofile" >&6;}
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -13020,6 +13373,10 @@ predeps=$lt_predeps
+ # shared library.
+ postdeps=$lt_postdeps
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path
+@@ -13268,6 +13625,7 @@ postdep_objects_CXX=
+ predeps_CXX=
+ postdeps_CXX=
+ compiler_lib_search_path_CXX=
++compiler_lib_search_dirs_CXX=
+ 
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -13305,7 +13663,7 @@ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -13512,7 +13870,7 @@ case $host_os in
+     # FIXME: insert proper C++ library support
+     ld_shlibs_CXX=no
+     ;;
+-  aix4* | aix5*)
++  aix[4-9]*)
+     if test "$host_cpu" = ia64; then
+       # On IA64, the linker does run time linking by default, so we don't
+       # have to do anything special.
+@@ -13525,7 +13883,7 @@ case $host_os in
+       # Test if we are trying to use run time linking or normal
+       # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+       # need to do runtime linking.
+-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++      case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	for ld_flag in $LDFLAGS; do
+ 	  case $ld_flag in
+ 	  *-brtl*)
+@@ -13783,51 +14141,23 @@ if test -z "$aix_libpath"; then aix_libp
+     fi
+   ;;
+       darwin* | rhapsody*)
+-        case $host_os in
+-        rhapsody* | darwin1.[012])
+-         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+-         ;;
+-       *) # Darwin 1.3 on
+-         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+-           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-         else
+-           case ${MACOSX_DEPLOYMENT_TARGET} in
+-             10.[012])
+-               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+-               ;;
+-             10.*)
+-               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+-               ;;
+-           esac
+-         fi
+-         ;;
+-        esac
+       archive_cmds_need_lc_CXX=no
+       hardcode_direct_CXX=no
+       hardcode_automatic_CXX=yes
+       hardcode_shlibpath_var_CXX=unsupported
+       whole_archive_flag_spec_CXX=''
+       link_all_deplibs_CXX=yes
+-
+-    if test "$GXX" = yes ; then
+-      lt_int_apple_cc_single_mod=no
++      allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++      if test "$GXX" = yes ; then
+       output_verbose_link_cmd='echo'
+-      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+-       lt_int_apple_cc_single_mod=yes
++      archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++      module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++      archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++      module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++      if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++        archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++        archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+       fi
+-      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      else
+-          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-        fi
+-        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          else
+-            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-          fi
+-            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+       else
+       case $cc_basename in
+         xlc*)
+@@ -14078,7 +14408,7 @@ if test -z "$aix_libpath"; then aix_libp
+ 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ 	;;
+-      pgCC*)
++      pgCC* | pgcpp*)
+         # Portland Group C++ compiler
+ 	archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+   	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -14151,7 +14481,7 @@ if test -z "$aix_libpath"; then aix_libp
+ 	;;
+     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=
+@@ -14485,7 +14815,6 @@ test "$ld_shlibs_CXX" = no && can_build_
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+ 
+-
+ cat > conftest.$ac_ext <<EOF
+ class Foo
+ {
+@@ -14587,6 +14916,11 @@ fi
+ 
+ $rm -f confest.$objext
+ 
++compiler_lib_search_dirs_CXX=
++if test -n "$compiler_lib_search_path_CXX"; then
++  compiler_lib_search_dirs_CXX=`echo " ${compiler_lib_search_path_CXX}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ case $host_os in
+ interix[3-9]*)
+@@ -14642,7 +14976,6 @@ solaris*)
+   ;;
+ esac
+ 
+-
+ case " $postdeps_CXX " in
+ *" -lc "*) archive_cmds_need_lc_CXX=no ;;
+ esac
+@@ -14718,7 +15051,7 @@ echo $ECHO_N "checking for $compiler opt
+     esac
+   else
+     case $host_os in
+-      aix4* | aix5*)
++      aix[4-9]*)
+ 	# All AIX code is PIC.
+ 	if test "$host_cpu" = ia64; then
+ 	  # AIX 5 now supports IA64 processor
+@@ -14814,7 +15147,7 @@ echo $ECHO_N "checking for $compiler opt
+ 	    lt_prog_compiler_pic_CXX='-KPIC'
+ 	    lt_prog_compiler_static_CXX='-static'
+ 	    ;;
+-	  pgCC*)
++	  pgCC* | pgcpp*)
+ 	    # Portland Group C++ compiler.
+ 	    lt_prog_compiler_wl_CXX='-Wl,'
+ 	    lt_prog_compiler_pic_CXX='-fpic'
+@@ -14852,7 +15185,7 @@ echo $ECHO_N "checking for $compiler opt
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -14945,10 +15278,10 @@ if test -n "$lt_prog_compiler_pic_CXX"; 
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works_CXX=no
++  lt_cv_prog_compiler_pic_works_CXX=no
+   ac_outfile=conftest.$ac_objext
+    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+@@ -14961,27 +15294,27 @@ else
+    -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:14964: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15297: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14968: \$? = $ac_status" >&5
++   echo "$as_me:15301: \$? = $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
++       lt_cv_prog_compiler_pic_works_CXX=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+     case $lt_prog_compiler_pic_CXX in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -15008,10 +15341,10 @@ esac
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works_CXX=no
++  lt_cv_prog_compiler_static_works_CXX=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+    echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -15024,20 +15357,20 @@ else
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_CXX=yes
++         lt_cv_prog_compiler_static_works_CXX=yes
+        fi
+      else
+-       lt_prog_compiler_static_works_CXX=yes
++       lt_cv_prog_compiler_static_works_CXX=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+     :
+ else
+     lt_prog_compiler_static_CXX=
+@@ -15065,11 +15398,11 @@ else
+    -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:15068: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15401: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:15072: \$? = $ac_status" >&5
++   echo "$as_me:15405: \$? = $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
+@@ -15122,7 +15455,7 @@ echo $ECHO_N "checking whether the $comp
+ 
+   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+-  aix4* | aix5*)
++  aix[4-9]*)
+     # If we're using GNU nm, then we don't want the "-C" option.
+     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+     if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -15137,10 +15470,14 @@ echo $ECHO_N "checking whether the $comp
+   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
++  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ 
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -15242,7 +15579,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -15566,13 +15903,11 @@ linux* | k*bsd*-gnu)
+   # 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
+@@ -15584,6 +15919,18 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++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*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -15765,6 +16112,21 @@ esac
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -15848,6 +16210,7 @@ if test -f "$ltmain"; then
+     predeps_CXX \
+     postdeps_CXX \
+     compiler_lib_search_path_CXX \
++    compiler_lib_search_dirs_CXX \
+     archive_cmds_CXX \
+     archive_expsym_cmds_CXX \
+     postinstall_cmds_CXX \
+@@ -16096,6 +16459,10 @@ predeps=$lt_predeps_CXX
+ # shared library.
+ postdeps=$lt_postdeps_CXX
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+@@ -16310,7 +16677,7 @@ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -16348,7 +16715,7 @@ aix3*)
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
+-aix4* | aix5*)
++aix[4-9]*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+@@ -16613,10 +16980,10 @@ if test -n "$lt_prog_compiler_pic_F77"; 
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works_F77=no
++  lt_cv_prog_compiler_pic_works_F77=no
+   ac_outfile=conftest.$ac_objext
+    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_F77"
+@@ -16629,27 +16996,27 @@ else
+    -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:16632: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16999: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16636: \$? = $ac_status" >&5
++   echo "$as_me:17003: \$? = $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
++       lt_cv_prog_compiler_pic_works_F77=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+     case $lt_prog_compiler_pic_F77 in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -16676,10 +17043,10 @@ esac
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works_F77=no
++  lt_cv_prog_compiler_static_works_F77=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+    echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -16692,20 +17059,20 @@ else
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_F77=yes
++         lt_cv_prog_compiler_static_works_F77=yes
+        fi
+      else
+-       lt_prog_compiler_static_works_F77=yes
++       lt_cv_prog_compiler_static_works_F77=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+     :
+ else
+     lt_prog_compiler_static_F77=
+@@ -16733,11 +17100,11 @@ else
+    -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:16736: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17103: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:16740: \$? = $ac_status" >&5
++   echo "$as_me:17107: \$? = $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
+@@ -16817,12 +17184,13 @@ echo $ECHO_N "checking whether the $comp
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   for cc_temp in $compiler""; do
+@@ -16881,7 +17249,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	ld_shlibs_F77=no
+@@ -16997,12 +17365,13 @@ EOF
+   $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
++	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=
+@@ -17100,7 +17469,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[4-9]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -17120,7 +17489,7 @@ _LT_EOF
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -17372,11 +17741,10 @@ if test -z "$aix_libpath"; then aix_libp
+       link_all_deplibs_F77=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+@@ -17526,7 +17894,7 @@ if test -z "$aix_libpath"; then aix_libp
+       link_all_deplibs_F77=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -17845,7 +18213,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -18169,13 +18537,11 @@ linux* | k*bsd*-gnu)
+   # 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
+@@ -18187,6 +18553,18 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++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*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -18368,6 +18746,21 @@ esac
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -18451,6 +18844,7 @@ if test -f "$ltmain"; then
+     predeps_F77 \
+     postdeps_F77 \
+     compiler_lib_search_path_F77 \
++    compiler_lib_search_dirs_F77 \
+     archive_cmds_F77 \
+     archive_expsym_cmds_F77 \
+     postinstall_cmds_F77 \
+@@ -18699,6 +19093,10 @@ predeps=$lt_predeps_F77
+ # shared library.
+ postdeps=$lt_postdeps_F77
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -18873,7 +19271,7 @@ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -18922,11 +19320,11 @@ else
+    -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:18925: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19323: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:18929: \$? = $ac_status" >&5
++   echo "$as_me:19327: \$? = $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.
+@@ -18986,7 +19384,7 @@ echo $ECHO_N "checking for $compiler opt
+       # built for inclusion in a dll (and should export symbols for example).
+       # Although the cygwin gcc ignores -fPIC, still need this for old-style
+       # (--disable-auto-import) libraries
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+       ;;
+ 
+     darwin* | rhapsody*)
+@@ -19056,7 +19454,7 @@ echo $ECHO_N "checking for $compiler opt
+     mingw* | cygwin* | pw32* | os2*)
+       # This hack is so that the source file can tell whether it is being
+       # built for inclusion in a dll (and should export symbols for example).
+-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+       ;;
+ 
+     hpux9* | hpux10* | hpux11*)
+@@ -19196,10 +19594,10 @@ if test -n "$lt_prog_compiler_pic_GCJ"; 
+ 
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_pic_works_GCJ=no
++  lt_cv_prog_compiler_pic_works_GCJ=no
+   ac_outfile=conftest.$ac_objext
+    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+    lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+@@ -19212,27 +19610,27 @@ else
+    -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:19215: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19613: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:19219: \$? = $ac_status" >&5
++   echo "$as_me:19617: \$? = $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
++       lt_cv_prog_compiler_pic_works_GCJ=yes
+      fi
+    fi
+    $rm conftest*
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+ 
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+     case $lt_prog_compiler_pic_GCJ in
+      "" | " "*) ;;
+      *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -19259,10 +19657,10 @@ esac
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  lt_prog_compiler_static_works_GCJ=no
++  lt_cv_prog_compiler_static_works_GCJ=no
+    save_LDFLAGS="$LDFLAGS"
+    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+    echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -19275,20 +19673,20 @@ else
+        $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+        if diff conftest.exp conftest.er2 >/dev/null; then
+-         lt_prog_compiler_static_works_GCJ=yes
++         lt_cv_prog_compiler_static_works_GCJ=yes
+        fi
+      else
+-       lt_prog_compiler_static_works_GCJ=yes
++       lt_cv_prog_compiler_static_works_GCJ=yes
+      fi
+    fi
+-   $rm conftest*
++   $rm -r conftest*
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+ 
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+     :
+ else
+     lt_prog_compiler_static_GCJ=
+@@ -19316,11 +19714,11 @@ else
+    -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:19319: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19717: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:19323: \$? = $ac_status" >&5
++   echo "$as_me:19721: \$? = $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
+@@ -19400,12 +19798,13 @@ echo $ECHO_N "checking whether the $comp
+   # it will be wrapped by ` (' and `)$', so one must not match beginning or
+   # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+   # as well as any symbol that contains `d'.
+-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+   # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+   # platforms (ab)use it in PIC code, but their linkers get confused if
+   # the symbol is explicitly referenced.  Since portable code cannot
+   # rely on this symbol name, it's probably fine to never include it in
+   # preloaded symbol tables.
++  # Exclude shared library initialization/finalization symbols.
+   extract_expsyms_cmds=
+   # Just being paranoid about ensuring that cc_basename is set.
+   for cc_temp in $compiler""; do
+@@ -19464,7 +19863,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
+ 
+     # See if GNU ld supports shared libraries.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
++    aix[3-9]*)
+       # On AIX/PPC, the GNU linker is very broken
+       if test "$host_cpu" != ia64; then
+ 	ld_shlibs_GCJ=no
+@@ -19580,12 +19979,13 @@ EOF
+   $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
++	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=
+@@ -19683,7 +20083,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    aix4* | aix5*)
++    aix[4-9]*)
+       if test "$host_cpu" = ia64; then
+ 	# On IA64, the linker does run time linking by default, so we don't
+ 	# have to do anything special.
+@@ -19703,7 +20103,7 @@ _LT_EOF
+ 	# Test if we are trying to use run time linking or normal
+ 	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ 	# need to do runtime linking.
+-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ 	  for ld_flag in $LDFLAGS; do
+   	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+   	    aix_use_runtimelinking=yes
+@@ -19975,11 +20375,10 @@ if test -z "$aix_libpath"; then aix_libp
+       link_all_deplibs_GCJ=yes
+     if test "$GCC" = yes ; then
+     	output_verbose_link_cmd='echo'
+-        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+-      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+-      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+-      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++        archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++        module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++        archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++        module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+     else
+       case $cc_basename in
+         xlc*)
+@@ -20129,7 +20528,7 @@ if test -z "$aix_libpath"; then aix_libp
+       link_all_deplibs_GCJ=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ 	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -20448,7 +20847,7 @@ aix3*)
+   soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+-aix4* | aix5*)
++aix[4-9]*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -20772,13 +21171,11 @@ linux* | k*bsd*-gnu)
+   # 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
+@@ -20790,6 +21187,18 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++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*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -20971,6 +21380,21 @@ esac
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -21054,6 +21478,7 @@ if test -f "$ltmain"; then
+     predeps_GCJ \
+     postdeps_GCJ \
+     compiler_lib_search_path_GCJ \
++    compiler_lib_search_dirs_GCJ \
+     archive_cmds_GCJ \
+     archive_expsym_cmds_GCJ \
+     postinstall_cmds_GCJ \
+@@ -21302,6 +21727,10 @@ predeps=$lt_predeps_GCJ
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -21475,7 +21904,7 @@ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ 
+ 
+ # Allow CC to be a program name with arguments.
+@@ -21535,6 +21964,7 @@ if test -f "$ltmain"; then
+     predeps_RC \
+     postdeps_RC \
+     compiler_lib_search_path_RC \
++    compiler_lib_search_dirs_RC \
+     archive_cmds_RC \
+     archive_expsym_cmds_RC \
+     postinstall_cmds_RC \
+@@ -21783,6 +22213,10 @@ predeps=$lt_predeps_RC
+ # shared library.
+ postdeps=$lt_postdeps_RC
+ 
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -22286,7 +22720,7 @@ _ACEOF
+ 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
+@@ -22780,12 +23214,12 @@ if test -n "$PKG_CONFIG"; 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
+@@ -22798,12 +23232,12 @@ if test -n "$PKG_CONFIG"; 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
+@@ -22822,14 +23256,14 @@ 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
+ 
+@@ -22840,7 +23274,7 @@ Alternatively, you may set the environme
+ 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
+ 
+@@ -22894,12 +23328,12 @@ if test -n "$PKG_CONFIG"; 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
+@@ -22912,12 +23346,12 @@ if test -n "$PKG_CONFIG"; 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
+@@ -22936,14 +23370,14 @@ 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
+ 
+@@ -22954,7 +23388,7 @@ Alternatively, you may set the environme
+ 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
+ 
+@@ -23137,6 +23571,120 @@ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
+ 
+ 
+ 
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for GIO" >&5
++echo $ECHO_N "checking for GIO... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$GIO_CFLAGS"; then
++        pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$GIO_LIBS"; then
++        pkg_cv_GIO_LIBS="$GIO_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gio-2.0\"") >&5
++  ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++        _pkg_short_errors_supported=yes
++else
++        _pkg_short_errors_supported=no
++fi
++        if test $_pkg_short_errors_supported = yes; then
++	        GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gio-2.0"`
++        else
++	        GIO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gio-2.0"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$GIO_PKG_ERRORS" >&5
++
++	{ { echo "$as_me:$LINENO: error: Package requirements (gio-2.0) were not met:
++
++$GIO_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 GIO_CFLAGS
++and GIO_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 (gio-2.0) were not met:
++
++$GIO_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 GIO_CFLAGS
++and GIO_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++" >&2;}
++   { (exit 1); exit 1; }; }
++elif test $pkg_failed = untried; then
++	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GIO_CFLAGS
++and GIO_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&5
++echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables GIO_CFLAGS
++and GIO_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++else
++	GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
++	GIO_LIBS=$pkg_cv_GIO_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	:
++fi
++
++
++
++
+ { echo "$as_me:$LINENO: checking whether Python plugin support is requested" >&5
+ echo $ECHO_N "checking whether Python plugin support is requested... $ECHO_C" >&6; }
+ # Check whether --enable-python was given.
+@@ -24606,15 +25154,21 @@ fi
+ 
+ 	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
+@@ -24657,6 +25211,80 @@ 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
+@@ -24668,14 +25296,14 @@ if test -n "$PKG_CONFIG"; then
+     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
+@@ -24689,14 +25317,14 @@ if test -n "$PKG_CONFIG"; then
+     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
+@@ -24716,10 +25344,10 @@ else
+ 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
+@@ -24736,6 +25364,7 @@ else
+ 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
+@@ -24751,23 +25380,23 @@ if test -n "$PKG_CONFIG"; then
+     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
+@@ -24781,23 +25410,23 @@ if test -n "$PKG_CONFIG"; then
+     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
+@@ -24817,16 +25446,16 @@ else
+ 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
+@@ -24846,6 +25475,10 @@ 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
+@@ -25070,10 +25703,18 @@ 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.
+@@ -25181,7 +25822,15 @@ fi
+ 
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
++		if $PKG_CONFIG --exists libxul; then
++		if $PKG_CONFIG --atleast-version=1.9.2 libxul; then
++			MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`"
++		else
++			MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++		fi
++	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
+@@ -25227,8 +25876,16 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 	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
++		if ! $PKG_CONFIG --atleast-version=1.9.2 libxul; then
++			CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++		fi
++		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; }
+@@ -25296,7 +25953,11 @@ 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;}
+@@ -25386,7 +26047,11 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
+ 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"
++	if  $MOZILLA_VERSION_MIN = 1.9  &&  $PKG_CONFIG --atleast-version=1.9.2 libxul ; then
++		CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT"
++	else
++		CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
++	fi
+ 
+ 
+ 
+@@ -27819,6 +28484,7 @@ OMF_DIR!$OMF_DIR$ac_delim
+ DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
+ ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
+ ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
++DISTCHECK_CONFIGURE_FLAGS!$DISTCHECK_CONFIGURE_FLAGS$ac_delim
+ HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+ HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$ac_delim
+ CXX!$CXX$ac_delim
+@@ -27840,6 +28506,8 @@ LN_S!$LN_S$ac_delim
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+ CXXCPP!$CXXCPP$ac_delim
+ F77!$F77$ac_delim
+ FFLAGS!$FFLAGS$ac_delim
+@@ -27867,6 +28535,8 @@ HAVE_GNOME_TRUE!$HAVE_GNOME_TRUE$ac_deli
+ HAVE_GNOME_FALSE!$HAVE_GNOME_FALSE$ac_delim
+ GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+ GTK_LIBS!$GTK_LIBS$ac_delim
++GIO_CFLAGS!$GIO_CFLAGS$ac_delim
++GIO_LIBS!$GIO_LIBS$ac_delim
+ PYTHON!$PYTHON$ac_delim
+ PYTHON_VERSION!$PYTHON_VERSION$ac_delim
+ PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
+@@ -27882,11 +28552,6 @@ PYTHON_CFLAGS!$PYTHON_CFLAGS$ac_delim
+ PYTHON_EXTRA_LIBS!$PYTHON_EXTRA_LIBS$ac_delim
+ PYGTK_CFLAGS!$PYGTK_CFLAGS$ac_delim
+ PYGTK_LIBS!$PYGTK_LIBS$ac_delim
+-PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
+-PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim
+-PYGTK_H2DEF!$PYGTK_H2DEF$ac_delim
+-NO_STRICT_ALIASING_CFLAGS!$NO_STRICT_ALIASING_CFLAGS$ac_delim
+-ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -27928,6 +28593,11 @@ _ACEOF
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
++PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim
++PYGTK_H2DEF!$PYGTK_H2DEF$ac_delim
++NO_STRICT_ALIASING_CFLAGS!$NO_STRICT_ALIASING_CFLAGS$ac_delim
++ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim
+ ENABLE_PYTHON_FALSE!$ENABLE_PYTHON_FALSE$ac_delim
+ VALA_CFLAGS!$VALA_CFLAGS$ac_delim
+ VALA_LIBS!$VALA_LIBS$ac_delim
+@@ -28020,7 +28690,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -Nurp totem-2.22.1.orig/data/Makefile.in totem-2.22.1/data/Makefile.in
+--- totem-2.22.1.orig/data/Makefile.in	2010-06-24 20:44:31.520079348 +0000
++++ totem-2.22.1/data/Makefile.in	2010-06-24 20:44:44.990067921 +0000
+@@ -115,7 +115,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -131,6 +133,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -212,6 +216,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/16x16/Makefile.in totem-2.22.1/data/icons/16x16/Makefile.in
+--- totem-2.22.1.orig/data/icons/16x16/Makefile.in	2010-06-24 20:44:31.540081612 +0000
++++ totem-2.22.1/data/icons/16x16/Makefile.in	2010-06-24 20:44:45.072574080 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/22x22/Makefile.in totem-2.22.1/data/icons/22x22/Makefile.in
+--- totem-2.22.1.orig/data/icons/22x22/Makefile.in	2010-06-24 20:44:31.530108137 +0000
++++ totem-2.22.1/data/icons/22x22/Makefile.in	2010-06-24 20:44:45.142662458 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/24x24/Makefile.in totem-2.22.1/data/icons/24x24/Makefile.in
+--- totem-2.22.1.orig/data/icons/24x24/Makefile.in	2010-06-24 20:44:31.540081612 +0000
++++ totem-2.22.1/data/icons/24x24/Makefile.in	2010-06-24 20:44:45.222636309 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/32x32/Makefile.in totem-2.22.1/data/icons/32x32/Makefile.in
+--- totem-2.22.1.orig/data/icons/32x32/Makefile.in	2010-06-24 20:44:31.530108137 +0000
++++ totem-2.22.1/data/icons/32x32/Makefile.in	2010-06-24 20:44:45.302631948 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/48x48/Makefile.in totem-2.22.1/data/icons/48x48/Makefile.in
+--- totem-2.22.1.orig/data/icons/48x48/Makefile.in	2010-06-24 20:44:31.540081612 +0000
++++ totem-2.22.1/data/icons/48x48/Makefile.in	2010-06-24 20:44:45.382578210 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/Makefile.in totem-2.22.1/data/icons/Makefile.in
+--- totem-2.22.1.orig/data/icons/Makefile.in	2010-06-24 20:44:31.530108137 +0000
++++ totem-2.22.1/data/icons/Makefile.in	2010-06-24 20:44:45.462578742 +0000
+@@ -92,7 +92,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -108,6 +110,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -189,6 +193,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/data/icons/scalable/Makefile.in totem-2.22.1/data/icons/scalable/Makefile.in
+--- totem-2.22.1.orig/data/icons/scalable/Makefile.in	2010-06-24 20:44:31.540081612 +0000
++++ totem-2.22.1/data/icons/scalable/Makefile.in	2010-06-24 20:44:45.542599040 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/help/Makefile.in totem-2.22.1/help/Makefile.in
+--- totem-2.22.1.orig/help/Makefile.in	2010-06-24 20:44:31.840169680 +0000
++++ totem-2.22.1/help/Makefile.in	2010-06-24 20:44:45.692641366 +0000
+@@ -117,7 +117,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -133,6 +135,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -214,6 +218,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/help/bg/Makefile.in totem-2.22.1/help/bg/Makefile.in
+--- totem-2.22.1.orig/help/bg/Makefile.in	2010-06-24 20:44:31.960068367 +0000
++++ totem-2.22.1/help/bg/Makefile.in	2010-06-24 20:44:45.772567653 +0000
+@@ -145,7 +145,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -161,6 +163,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -242,6 +246,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/lib/Makefile.in totem-2.22.1/lib/Makefile.in
+--- totem-2.22.1.orig/lib/Makefile.in	2010-06-24 20:44:32.050069683 +0000
++++ totem-2.22.1/lib/Makefile.in	2010-06-24 20:44:45.862567916 +0000
+@@ -106,7 +106,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -122,6 +124,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -203,6 +207,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/Makefile.in totem-2.22.1/src/Makefile.in
+--- totem-2.22.1.orig/src/Makefile.in	2010-06-24 20:44:31.570135851 +0000
++++ totem-2.22.1/src/Makefile.in	2010-06-24 20:44:46.142578300 +0000
+@@ -263,7 +263,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -279,6 +281,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = `pkg-config --variable=glib_genmarshal glib-2.0`
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -360,6 +364,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/backend/Makefile.in totem-2.22.1/src/backend/Makefile.in
+--- totem-2.22.1.orig/src/backend/Makefile.in	2010-06-24 20:44:31.590097886 +0000
++++ totem-2.22.1/src/backend/Makefile.in	2010-06-24 20:44:46.272611862 +0000
+@@ -139,7 +139,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -155,6 +157,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = `pkg-config --variable=glib_genmarshal glib-2.0`
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -236,6 +240,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/Makefile.in totem-2.22.1/src/plugins/Makefile.in
+--- totem-2.22.1.orig/src/plugins/Makefile.in	2010-06-24 20:44:31.640070509 +0000
++++ totem-2.22.1/src/plugins/Makefile.in	2010-06-24 20:44:46.382641347 +0000
+@@ -141,7 +141,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -157,6 +159,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -238,6 +242,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/bemused/Makefile.in totem-2.22.1/src/plugins/bemused/Makefile.in
+--- totem-2.22.1.orig/src/plugins/bemused/Makefile.in	2010-06-24 20:44:31.670070621 +0000
++++ totem-2.22.1/src/plugins/bemused/Makefile.in	2010-06-24 20:44:46.482609919 +0000
+@@ -113,7 +113,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -129,6 +131,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -210,6 +214,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/galago/Makefile.in totem-2.22.1/src/plugins/galago/Makefile.in
+--- totem-2.22.1.orig/src/plugins/galago/Makefile.in	2010-06-24 20:44:31.670070621 +0000
++++ totem-2.22.1/src/plugins/galago/Makefile.in	2010-06-24 20:44:46.592614966 +0000
+@@ -114,7 +114,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -130,6 +132,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -211,6 +215,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/gromit/Makefile.in totem-2.22.1/src/plugins/gromit/Makefile.in
+--- totem-2.22.1.orig/src/plugins/gromit/Makefile.in	2010-06-24 20:44:31.660079756 +0000
++++ totem-2.22.1/src/plugins/gromit/Makefile.in	2010-06-24 20:44:46.692610287 +0000
+@@ -113,7 +113,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -129,6 +131,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -210,6 +214,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/lirc/Makefile.in totem-2.22.1/src/plugins/lirc/Makefile.in
+--- totem-2.22.1.orig/src/plugins/lirc/Makefile.in	2010-06-24 20:44:31.680081879 +0000
++++ totem-2.22.1/src/plugins/lirc/Makefile.in	2010-06-24 20:44:46.792609865 +0000
+@@ -114,7 +114,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -130,6 +132,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -211,6 +215,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/media-player-keys/Makefile.in totem-2.22.1/src/plugins/media-player-keys/Makefile.in
+--- totem-2.22.1.orig/src/plugins/media-player-keys/Makefile.in	2010-06-24 20:44:31.610074657 +0000
++++ totem-2.22.1/src/plugins/media-player-keys/Makefile.in	2010-06-24 20:44:46.902570835 +0000
+@@ -119,7 +119,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -135,6 +137,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -216,6 +220,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/mythtv/Makefile.in totem-2.22.1/src/plugins/mythtv/Makefile.in
+--- totem-2.22.1.orig/src/plugins/mythtv/Makefile.in	2010-06-24 20:44:31.620132989 +0000
++++ totem-2.22.1/src/plugins/mythtv/Makefile.in	2010-06-24 20:44:47.012583422 +0000
+@@ -117,7 +117,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -133,6 +135,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -214,6 +218,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/ontop/Makefile.in totem-2.22.1/src/plugins/ontop/Makefile.in
+--- totem-2.22.1.orig/src/plugins/ontop/Makefile.in	2010-06-24 20:44:31.650068916 +0000
++++ totem-2.22.1/src/plugins/ontop/Makefile.in	2010-06-24 20:44:47.112588734 +0000
+@@ -113,7 +113,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -129,6 +131,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -210,6 +214,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/properties/Makefile.in totem-2.22.1/src/plugins/properties/Makefile.in
+--- totem-2.22.1.orig/src/plugins/properties/Makefile.in	2010-06-24 20:44:31.670070621 +0000
++++ totem-2.22.1/src/plugins/properties/Makefile.in	2010-06-24 20:44:47.222625553 +0000
+@@ -126,7 +126,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -142,6 +144,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -223,6 +227,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/publish/Makefile.in totem-2.22.1/src/plugins/publish/Makefile.in
+--- totem-2.22.1.orig/src/plugins/publish/Makefile.in	2010-06-24 20:44:31.680081879 +0000
++++ totem-2.22.1/src/plugins/publish/Makefile.in	2010-06-24 20:44:47.332615368 +0000
+@@ -116,7 +116,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -132,6 +134,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -213,6 +217,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/sample-python/Makefile.in totem-2.22.1/src/plugins/sample-python/Makefile.in
+--- totem-2.22.1.orig/src/plugins/sample-python/Makefile.in	2010-06-24 20:44:31.650068916 +0000
++++ totem-2.22.1/src/plugins/sample-python/Makefile.in	2010-06-24 20:44:47.412620018 +0000
+@@ -80,7 +80,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -96,6 +98,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -177,6 +181,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/sample-vala/Makefile.in totem-2.22.1/src/plugins/sample-vala/Makefile.in
+--- totem-2.22.1.orig/src/plugins/sample-vala/Makefile.in	2010-06-24 20:44:31.660079756 +0000
++++ totem-2.22.1/src/plugins/sample-vala/Makefile.in	2010-06-24 20:44:47.512630425 +0000
+@@ -116,7 +116,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -132,6 +134,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -213,6 +217,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/screensaver/Makefile.in totem-2.22.1/src/plugins/screensaver/Makefile.in
+--- totem-2.22.1.orig/src/plugins/screensaver/Makefile.in	2010-06-24 20:44:31.660079756 +0000
++++ totem-2.22.1/src/plugins/screensaver/Makefile.in	2010-06-24 20:44:47.612605426 +0000
+@@ -115,7 +115,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -131,6 +133,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -212,6 +216,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/sidebar-test/Makefile.in totem-2.22.1/src/plugins/sidebar-test/Makefile.in
+--- totem-2.22.1.orig/src/plugins/sidebar-test/Makefile.in	2010-06-24 20:44:31.660079756 +0000
++++ totem-2.22.1/src/plugins/sidebar-test/Makefile.in	2010-06-24 20:44:47.712588524 +0000
+@@ -114,7 +114,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -130,6 +132,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -211,6 +215,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/skipto/Makefile.in totem-2.22.1/src/plugins/skipto/Makefile.in
+--- totem-2.22.1.orig/src/plugins/skipto/Makefile.in	2010-06-24 20:44:31.640070509 +0000
++++ totem-2.22.1/src/plugins/skipto/Makefile.in	2010-06-24 20:44:47.812635664 +0000
+@@ -116,7 +116,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -132,6 +134,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -213,6 +217,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/thumbnail/Makefile.in totem-2.22.1/src/plugins/thumbnail/Makefile.in
+--- totem-2.22.1.orig/src/plugins/thumbnail/Makefile.in	2010-06-24 20:44:31.670070621 +0000
++++ totem-2.22.1/src/plugins/thumbnail/Makefile.in	2010-06-24 20:44:47.932570319 +0000
+@@ -113,7 +113,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -129,6 +131,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -210,6 +214,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/totem/Makefile.in totem-2.22.1/src/plugins/totem/Makefile.in
+--- totem-2.22.1.orig/src/plugins/totem/Makefile.in	2010-06-24 20:44:31.670070621 +0000
++++ totem-2.22.1/src/plugins/totem/Makefile.in	2010-06-24 20:44:48.040068202 +0000
+@@ -90,7 +90,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -106,6 +108,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -187,6 +191,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/tracker/Makefile.in totem-2.22.1/src/plugins/tracker/Makefile.in
+--- totem-2.22.1.orig/src/plugins/tracker/Makefile.in	2010-06-24 20:44:31.680081879 +0000
++++ totem-2.22.1/src/plugins/tracker/Makefile.in	2010-06-24 20:44:48.150067799 +0000
+@@ -115,7 +115,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -131,6 +133,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -212,6 +216,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
+diff -Nurp totem-2.22.1.orig/src/plugins/youtube/Makefile.in totem-2.22.1/src/plugins/youtube/Makefile.in
+--- totem-2.22.1.orig/src/plugins/youtube/Makefile.in	2010-06-24 20:44:31.690083010 +0000
++++ totem-2.22.1/src/plugins/youtube/Makefile.in	2010-06-24 20:44:48.240070437 +0000
+@@ -95,7 +95,9 @@ DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ DISABLE_DEPRECATED = @DISABLE_DEPRECATED@
++DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ DOC_USER_FORMATS = @DOC_USER_FORMATS@
++DSYMUTIL = @DSYMUTIL@
+ ECHO = @ECHO@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+@@ -111,6 +113,8 @@ GCONFTOOL = @GCONFTOOL@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
++GIO_CFLAGS = @GIO_CFLAGS@
++GIO_LIBS = @GIO_LIBS@
+ GLIB_CFLAGS = @GLIB_CFLAGS@
+ GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
+ GLIB_LIBS = @GLIB_LIBS@
+@@ -192,6 +196,7 @@ MSGMERGE = @MSGMERGE@
+ NAUTILUSDIR = @NAUTILUSDIR@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
++NMEDIT = @NMEDIT@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+ NVTV_CFLAGS = @NVTV_CFLAGS@
+ NVTV_LIBS = @NVTV_LIBS@
--- totem-2.22.1.orig/debian/patches/04_desktop_gettext_domain.patch
+++ totem-2.22.1/debian/patches/04_desktop_gettext_domain.patch
@@ -0,0 +1,10 @@
+# Description: add translation domain
+# UbuntuSpecific: language pack change
+#
+--- a/data/totem.desktop.in.in.in	2008-02-27 12:20:20.000000000 +0100
++++ b/data/totem.desktop.in.in.in	2008-02-27 12:24:13.000000000 +0100
+@@ -14,3 +14,4 @@
+ X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
+ X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
+ StartupNotify=true
++X-Ubuntu-Gettext-Domain=totem
--- totem-2.22.1.orig/debian/patches/32_stop_on_sigusr1.patch
+++ totem-2.22.1/debian/patches/32_stop_on_sigusr1.patch
@@ -0,0 +1,77 @@
+Index: totem-2.22.1/src/totem.c
+===================================================================
+--- totem-2.22.1.orig/src/totem.c	2009-03-05 13:58:41.000000000 -0500
++++ totem-2.22.1/src/totem.c	2009-03-05 14:20:43.000000000 -0500
+@@ -34,6 +34,7 @@
+ #include <totem-disc.h>
+ #include <stdlib.h>
+ #include <math.h>
++#include <signal.h>
+ 
+ #ifndef HAVE_GTK_ONLY
+ #include <gnome.h>
+@@ -3079,6 +3080,55 @@
+ 	g_free (url);
+ }
+ 
++/* BEGIN SUSPEND/RESUME HACK */
++
++/* A bit of a hack here to stop playback upon receiving the SIGUSR1 signal.
++   This is useful to prevent gstreamer screwing up upon suspend. */
++static Totem *signal_totem = NULL;
++
++static void
++totem_signal_handler (int signo)
++{
++  static int in_fatal = 0;
++  int ignore;
++
++  /* avoid loops */
++  if (in_fatal > 0)
++    return;
++  ++in_fatal;
++
++  switch (signo)
++  {
++    case SIGUSR1:
++      --in_fatal;
++      /* Indicates a suspend/hibernate event */
++	if (signal_totem != NULL)
++		totem_action_stop (signal_totem);
++      break;
++			
++    default:
++      signal (signo, totem_signal_handler);
++      break;
++  }
++}
++
++static void
++setup_signals (Totem *totem)
++{
++	struct sigaction action;
++	sigset_t mask;
++
++	signal_totem = totem;
++
++	sigemptyset (&mask);
++	action.sa_handler = totem_signal_handler;
++	action.sa_mask = mask;
++	action.sa_flags = 0;
++	sigaction (SIGUSR1,  &action, NULL);
++}
++
++/* END SUSPEND/RESUME HACK */
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -3162,6 +3212,8 @@
+ 		totem_options_process_early (totem, &optionstate);
+ 	}
+ 
++	setup_signals (totem);
++
+ 	/* Main window */
+ 	totem->xml = totem_interface_load ("totem.ui", TRUE, NULL, totem);
+ 	if (totem->xml == NULL)
--- totem-2.22.1.orig/debian/patches/25_revert-xine-reqs-bump.patch
+++ totem-2.22.1/debian/patches/25_revert-xine-reqs-bump.patch
@@ -0,0 +1,11 @@
+--- a/configure.in	2008-02-27 12:24:21.000000000 +0100
++++ b/configure.in	2008-02-27 12:24:51.000000000 +0100
+@@ -67,7 +67,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.22.1.orig/debian/patches/31_totem_xulrunner192.patch
+++ totem-2.22.1/debian/patches/31_totem_xulrunner192.patch
@@ -0,0 +1,3138 @@
+Index: totem-2.22.1/configure.in
+===================================================================
+--- totem-2.22.1.orig/configure.in	2010-06-24 22:36:34.460094418 +0100
++++ totem-2.22.1/configure.in	2010-06-24 22:36:34.660077940 +0100
+@@ -255,6 +255,10 @@
+ GTK_LIBS="$GTK_LIBS $EXTRA_BACKEND_LIBS"
+ AC_SUBST(GTK_LIBS)
+ 
++PKG_CHECK_MODULES(GIO, gio-2.0)
++AC_SUBST(GIO_CFLAGS)
++AC_SUBST(GIO_LIBS)
++
+ dnl ================================================================
+ dnl Python plugins
+ dnl ================================================================
+@@ -735,7 +739,11 @@
+ if test "$enable_browser_plugins" = "yes" ; then
+ 	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"
++		if $PKG_CONFIG --atleast-version=1.9.2 libxul; then
++			MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`"
++		else
++			MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++		fi
+ 	else
+ 		MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
+ 	fi
+@@ -771,7 +779,9 @@
+ 	CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
+ 	CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
+ 	if test $MOZILLA_VERSION_MIN = 1.9; then
+-		CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++		if ! $PKG_CONFIG --atleast-version=1.9.2 libxul; then
++			CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++		fi
+ 		LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS"
+ 		LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
+         else 
+@@ -834,7 +844,11 @@
+ if test "$enable_browser_plugins" = "yes"; then
+ 	AC_LANG_PUSH([C++])
+ 	__SAVE_CPPFLAGS=$CPPFLAGS
+-	CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
++	if [ $MOZILLA_VERSION_MIN = 1.9 ] && [ $PKG_CONFIG --atleast-version=1.9.2 libxul ]; then
++		CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT"
++	else
++		CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
++	fi
+ 
+ 	AC_CHECK_HEADERS([nsTArray.h])
+ 
+Index: totem-2.22.1/browser-plugin/totemPlugin.cpp
+===================================================================
+--- totem-2.22.1.orig/browser-plugin/totemPlugin.cpp	2010-06-24 21:44:49.170088290 +0100
++++ totem-2.22.1/browser-plugin/totemPlugin.cpp	2010-06-24 22:36:34.680070146 +0100
+@@ -32,6 +32,7 @@
+ #include <sys/poll.h>
+ #include <string.h>
+ #include <signal.h>
++#include <stdlib.h>
+ 
+ #include <glib.h>
+ 
+@@ -41,10 +42,8 @@
+ #include "totem-plugin-viewer-options.h"
+ #include "totempluginviewer-marshal.h"
+ 
+-#include "npapi.h"
+-#include "npupp.h"
++#include "npfunctions.h"
+ 
+-#include <nsIDOMWindow.h>
+ #include <nsIURI.h>
+ #include <nsEmbedString.h>
+ #include <nsIInterfaceRequestor.h>
+@@ -52,10 +51,6 @@
+ #include <nsIWebNavigation.h>
+ 
+ #include <nsIServiceManager.h>
+-#include <nsIDOMDocument.h>
+-#include <nsIDOMElement.h>
+-#include <nsIDOM3Node.h>
+-#include <nsIIOService.h>
+ #include <nsITimer.h>
+ #include <nsIComponentManager.h>
+ #include <nsIProtocolHandler.h>
+@@ -84,8 +79,6 @@
+ /* How much data bytes to request */
+ #define PLUGIN_STREAM_CHUNK_SIZE (8 * 1024)
+ 
+-NPNetscapeFuncs totemPlugin::sNPN;
+-
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+ nsTArray<totemPlugin*> *totemPlugin::sPlugins;
+ 
+@@ -182,27 +175,21 @@
+ 		mTimer = nsnull;
+ 	}
+ 
+-	NS_IF_RELEASE (mServiceManager);
+-	NS_IF_RELEASE (mIOService);
+-	NS_IF_RELEASE (mPluginDOMElement);
+-	NS_IF_RELEASE (mBaseURI);
+-	NS_IF_RELEASE (mRequestBaseURI);
+-	NS_IF_RELEASE (mRequestURI);
+-	NS_IF_RELEASE (mSrcURI);
++	g_free (mBaseURI);
++	g_free (mRequestBaseURI);
++	g_free (mRequestURI);
++	g_free (mSrcURI);
+ 
+ #ifdef TOTEM_GMP_PLUGIN
+-	NS_IF_RELEASE (mURLURI);
++	g_free (mURLURI);
+ #endif
+ 
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+-	NS_IF_RELEASE (mHrefURI);
+-	NS_IF_RELEASE (mQtsrcURI);
++	g_free (mHref);
++	g_free (mHrefURI);
++	g_free (mQtsrcURI);
+ #endif
+ 
+-#if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+-	NS_IF_RELEASE (mPluginOwnerDocument);
+-#endif /* TOTEM_COMPLEX_PLUGIN */
+-
+ 	D ("totemPlugin dtor [%p]", (void*) this);
+ }
+ 
+@@ -316,8 +303,7 @@
+ 		return NPERR_NO_ERROR;
+ #endif /* TOTEM_COMPLEX_PLUGIN */
+ 
+-	const char *userAgent = CallNPN_UserAgentProc (sNPN.uagent,
+-						       mInstance);
++	const char *userAgent = NPN_UserAgent (mInstance);
+ 	if (!userAgent) {
+ 		/* See https://bugzilla.mozilla.org/show_bug.cgi?id=328778 */
+ 		D ("User agent has more than 127 characters; fix your browser!");
+@@ -667,11 +653,11 @@
+ 
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+ 	/* Tell the viewer it has an href */
+-	if (!mHref.IsEmpty ()) {
++	if (mHref) {
+ 		dbus_g_proxy_call_no_reply (mViewerProxy,
+ 					    "SetHref",
+-					    G_TYPE_STRING, mHref.get (),
+-					    G_TYPE_STRING, mTarget.get (),
++					    G_TYPE_STRING, mHref,
++					    G_TYPE_STRING, mTarget,
+ 					    G_TYPE_INVALID);
+ 	}
+ #endif /* TOTEM_NARROWSPACE_PLUGIN */
+@@ -684,20 +670,20 @@
+ 
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+ 	/* FIXME set href="" afterwards, so we don't try to launch again when the user clicks again? */
+-	if (!mHref.IsEmpty ()) {
+-		if (g_ascii_strcasecmp (mTarget.get (), "quicktimeplayer") == 0) {
+-			D ("Opening movie '%s' in external player", mHref.get ());
++	if (mHref) {
++		if (g_ascii_strcasecmp (mTarget, "quicktimeplayer") == 0) {
++			D ("Opening movie '%s' in external player", mHref);
+ 			dbus_g_proxy_call_no_reply (mViewerProxy,
+ 						    "LaunchPlayer",
+-						    G_TYPE_STRING, mHref.get (),
++						    G_TYPE_STRING, mHref,
+ 						    G_TYPE_UINT, time,
+ 						    G_TYPE_INVALID);
+ 			return;
+ 		}
+-		if (g_ascii_strcasecmp (mTarget.get (), "myself") == 0 ||
+-		    mTarget.Equals (NS_LITERAL_CSTRING ("_current")) ||
+-		    mTarget.Equals (NS_LITERAL_CSTRING ("_self"))) {
+-			D ("Opening movie '%s'", mHref.get ());
++		if (g_ascii_strcasecmp (mTarget, "myself") == 0 ||
++		    g_ascii_strcasecmp (mTarget, "_current") == 0 ||
++		    g_ascii_strcasecmp (mTarget, "_self") == 0) {
++			D ("Opening movie '%s'", mHref);
+ 			dbus_g_proxy_call_no_reply (mViewerProxy,
+ 						    "SetHref",
+ 						    G_TYPE_STRING, NULL,
+@@ -712,18 +698,17 @@
+ 		/* Load URL in browser. This will either open a new website,
+ 		 * or execute some javascript.
+ 		 */
+-		nsCString href;
++                const char *href = NULL;
+ 		if (mHrefURI) {
+-			mHrefURI->GetSpec (href);
++			href = mHrefURI;
+ 		} else {
+ 			href = mHref;
+ 		}
+ 
+-		if (CallNPN_GetURLProc (sNPN.geturl,
+-					mInstance,
+-					href.get (),
+-					mTarget.get ()) != NPERR_NO_ERROR) {
+-			D ("Failed to launch URL '%s' in browser", mHref.get ());
++		if (NPN_GetURL (mInstance,
++				href,
++				mTarget) != NPERR_NO_ERROR) {
++			D ("Failed to launch URL '%s' in browser", mHref);
+ 		}
+ 
+ 		return;
+@@ -800,14 +785,11 @@
+ void
+ totemPlugin::ClearRequest ()
+ {
+-	if (mRequestBaseURI) {
+-		NS_RELEASE (mRequestBaseURI);
+-		mRequestBaseURI = nsnull;
+-	}
+-	if (mRequestURI) {
+-		NS_RELEASE (mRequestURI);
+-		mRequestURI = nsnull;
+-	}
++  g_free (mRequestURI);
++  mRequestURI = NULL;
++
++  g_free (mRequestBaseURI);
++  mRequestBaseURI = NULL;
+ }
+ 
+ void
+@@ -824,8 +806,8 @@
+ 	ClearRequest ();
+ 
+ 	/* Now work out which URL to request */
+-	nsIURI *baseURI = nsnull;
+-	nsIURI *requestURI = nsnull;
++	const char *baseURI = NULL;
++	const char *requestURI = NULL;
+ 
+ #ifdef TOTEM_GMP_PLUGIN
+ 	/* Prefer filename over src */
+@@ -864,17 +846,8 @@
+ 	if (!requestURI)
+ 		return;
+ 
+-	NS_ADDREF (mRequestBaseURI = baseURI);
+-	NS_ADDREF (mRequestURI = requestURI);
+-
+-	/* FIXME use the right base! */
+-	nsCString baseSpec, spec;
+-	baseURI->GetSpec (baseSpec);
+-	requestURI->GetSpec (spec);
+-
+-	/* Shouldn't happen, but who knows */
+-	if (spec.IsEmpty ())
+-		return;
++        mRequestURI = g_strdup (requestURI);
++        mRequestBaseURI = g_strdup (baseURI);
+ 
+ 	/* If we don't have a proxy yet */
+ 	if (!mViewerReady)
+@@ -883,7 +856,7 @@
+ 	/* If the URL is supported and the caller isn't asking us to make
+ 	 * the viewer open the stream, we call OpenStream, and
+ 	 * otherwise OpenURI. */
+-	if (!aForceViewer && IsSchemeSupported (requestURI)) {
++	if (!aForceViewer && IsSchemeSupported (requestURI, baseURI)) {
+ 		/* This will fail for the 2nd stream, but we shouldn't
+ 		 * ever come to using it for the 2nd stream... */
+ 
+@@ -893,8 +866,8 @@
+ 						 ViewerOpenStreamCallback,
+ 						 reinterpret_cast<void*>(this),
+ 						 NULL,
+-						 G_TYPE_STRING, spec.get (),
+-						 G_TYPE_STRING, baseSpec.get (),
++						 G_TYPE_STRING, requestURI,
++						 G_TYPE_STRING, baseURI,
+ 						 G_TYPE_INVALID);
+ 	} else {
+ 		mViewerPendingCall =
+@@ -903,8 +876,8 @@
+ 						 ViewerOpenURICallback,
+ 						 reinterpret_cast<void*>(this),
+ 						 NULL,
+-						 G_TYPE_STRING, spec.get (),
+-						 G_TYPE_STRING, baseSpec.get (),
++						 G_TYPE_STRING, requestURI,
++						 G_TYPE_STRING, baseURI,
+ 						 G_TYPE_INVALID);
+ 	}
+ 
+@@ -923,10 +896,9 @@
+ 	if (!mStream)
+ 		return;
+ 
+-	if (CallNPN_DestroyStreamProc (sNPN.destroystream,
+-	    			       mInstance,
+-				       mStream,
+-				       NPRES_DONE) != NPERR_NO_ERROR) {
++	if (NPN_DestroyStream (mInstance,
++			mStream,
++			NPRES_DONE) != NPERR_NO_ERROR) {
+ 		    g_warning ("Couldn't destroy the stream");
+ 		    /* FIXME: set mStream to NULL here too? */
+ 		    return;
+@@ -1092,23 +1064,20 @@
+ 	}
+ 
+ 	NS_ASSERTION (!plugin->mExpectingStream, "Already expecting a stream");
+-	NS_ENSURE_TRUE (plugin->mRequestURI, );
++	if (!plugin->mRequestURI)
++		return;
+ 
+ 	plugin->mExpectingStream = PR_TRUE;
+ 
+-	nsCString spec;
+-	plugin->mRequestURI->GetSpec (spec);
+-
+ 	/* Use GetURLNotify so we can reset mExpectingStream on failure */
+-	NPError err = CallNPN_GetURLNotifyProc (sNPN.geturlnotify,
+-						plugin->mInstance,
+-						spec.get (),
+-						nsnull,
+-						nsnull);
++	NPError err = NPN_GetURLNotify (plugin->mInstance,
++					plugin->mRequestURI,
++					nsnull,
++					nsnull);
+ 	if (err != NPERR_NO_ERROR) {
+ 		plugin->mExpectingStream = PR_FALSE;
+ 
+-		D ("GetURLNotify '%s' failed with error %d", spec.get (), err);
++		D ("GetURLNotify '%s' failed with error %d", plugin->mRequestURI, err);
+ 		return;
+ 	}
+ 
+@@ -1177,34 +1146,30 @@
+ 	D ("Real mime-type for '%s' not found", mimetype);
+ }
+ 
+-PRBool
+-totemPlugin::IsSchemeSupported (nsIURI *aURI)
++bool
++totemPlugin::IsSchemeSupported (const char *aURI, const char *aBaseURI)
+ {
+-	if (!aURI)
+-		return PR_FALSE;
+-
+-	nsCString scheme;
+-	nsresult rv = aURI->GetScheme (scheme);
+-	if (NS_FAILED (rv) || scheme.IsEmpty ())
+-		return PR_FALSE;
+-
+-	nsIProtocolHandler *handler = nsnull;
+-	rv = mIOService->GetProtocolHandler (scheme.get (), &handler);
+-
+-	/* Check that it's not the external protocol handler! */
+-	nsIExternalProtocolHandler *extHandler = nsnull;
+-	if (NS_SUCCEEDED (rv) && handler) {
+-		CallQueryInterface (handler, &extHandler);
+-	}
++  if (!aURI)
++    return false;
+ 
+-	PRBool isSupported = NS_SUCCEEDED (rv) && handler && !extHandler;
++  char *scheme = g_uri_parse_scheme (aURI);
++  if (!scheme) {
++    scheme = g_uri_parse_scheme (aBaseURI);
++    if (!scheme)
++      return false;
++  }
++
++  bool isSupported = false;
++  if (g_ascii_strcasecmp (scheme, "http") == 0 ||
++      g_ascii_strcasecmp (scheme, "https") == 0 ||
++      g_ascii_strcasecmp (scheme, "ftp") == 0)
++    isSupported = true;
+ 
+-	NS_IF_RELEASE (handler); /* this nullifies |handler| */
+-	NS_IF_RELEASE (extHandler);
++  D("IsSchemeSupported scheme '%s': %s", scheme, isSupported ? "yes" : "no");
+ 
+-	D ("IsSchemeSupported scheme '%s': %s", scheme.get (), isSupported ? "yes" : "no");
++  g_free (scheme);
+ 
+-	return isSupported;
++  return isSupported;
+ }
+ 
+ PRBool
+@@ -1269,117 +1234,83 @@
+ nsresult
+ totemPlugin::SetSrc (const nsACString& aURL)
+ {
+-	if (mSrcURI) {
+-		NS_RELEASE (mSrcURI);
+-		mSrcURI = nsnull;
+-	}
++	const char *tmp;
++
++        g_free (mSrcURI);
+ 
+-	mSrc = aURL;
++	NS_CStringGetData (aURL, &tmp);
+ 
+ 	/* If |src| is empty, don't resolve the URI! Otherwise we may
+ 	 * try to load an (probably iframe) html document as our video stream.
+ 	 */
+-	if (mSrc.Length () == 0)
+-		return NS_OK;
++	if (!tmp || !tmp[0]) {
++              mSrcURI = NULL;
++              return NS_OK;
++        }
+ 
+-	nsresult rv = mIOService->NewURI (aURL, nsnull /* FIXME! use document charset */,
+-					  mBaseURI, &mSrcURI);
+-	if (NS_FAILED (rv)) {
+-		D ("Failed to create src URI (rv=%x)", rv);
+-		mSrcURI = nsnull;
++        mSrcURI = g_strdup (tmp);
++
++	if (mAutostart) {
++		RequestStream (PR_FALSE);
+ 	} else {
+-		if (mAutostart) {
+-			RequestStream (PR_FALSE);
+-		} else {
+-			mWaitingForButtonPress = PR_TRUE;
+-		}
++		mWaitingForButtonPress = PR_TRUE;
+ 	}
+ 
+-	return rv;
++	return NS_OK;
+ }
+ 
+ #ifdef TOTEM_GMP_PLUGIN
+ 
+-nsresult
+-totemPlugin::SetURL (const nsACString& aURL)
++void
++totemPlugin::SetURL (const char *aURL)
+ {
+-	if (mURLURI) {
+-		NS_RELEASE (mURLURI);
+-		mURLURI = nsnull;
+-	}
++	g_free (mURLURI);
+ 
+ 	/* Don't allow empty URL */
+-	if (aURL.Length () == 0)
+-		return NS_OK;
+-
+-	/* FIXME: what is the correct base for the URL param? */
+-	nsresult rv;
+-	nsIURI *baseURI;
+-	if (mSrcURI) {
+-		baseURI = mSrcURI;
+-	} else {
+-		baseURI = mBaseURI;
+-	}
+-
+-	rv = mIOService->NewURI (aURL, nsnull /* FIXME document charset? */,
+-				 baseURI, &mURLURI);
+-	if (NS_FAILED (rv)) {
+-		D ("Failed to create URL URI (rv=%x)", rv);
+-	}
+-
+-	/* FIXME: security checks? */
++        if (!aURL || !aURL[0]) {
++                mURLURI = NULL;
++		return;
++        }
+ 
+-	return rv;
++        mURLURI = g_strdup (aURL);
+ }
+ 
+ #endif /* TOTEM_GMP_PLUGIN */
+ 
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+ 
+-nsresult
+-totemPlugin::SetQtsrc (const nsCString& aURL)
++bool
++totemPlugin::SetQtsrc (const char *aURL)
+ {
+ 	/* FIXME can qtsrc have URL extensions? */
+ 
+-	if (mQtsrcURI) {
+-		NS_RELEASE (mQtsrcURI);
+-		mQtsrcURI = nsnull;
+-	}
++	g_free (mQtsrcURI);
+ 
+ 	/* Don't allow empty qtsrc */
+-	if (aURL.Length () == 0)
+-		return NS_OK;
+-
+-	nsresult rv;
+-	nsIURI *baseURI;
+-	if (mSrcURI) {
+-		baseURI = mSrcURI;
+-	} else {
+-		baseURI = mBaseURI;
++	if (!aURL || !aURL[0]) {
++                mQtsrcURI = NULL;
++		return true;
+ 	}
+ 
+-	rv = mIOService->NewURI (aURL, nsnull /* FIXME document charset? */,
+-				 baseURI, &mQtsrcURI);
+-	if (NS_FAILED (rv)) {
+-		D ("Failed to create QTSRC URI (rv=%x)", rv);
+-	}
++	mQtsrcURI = g_strdup (aURL);
+ 
+ 	/* FIXME: security checks? */
+ 
+-	return rv;
++	return true;
+ }
+ 
+-nsresult
+-totemPlugin::SetHref (const nsCString& aURL)
++bool
++totemPlugin::SetHref (const char *aURL)
+ {
+-	nsCString url, target;
+-	PRBool hasExtensions = ParseURLExtensions (aURL, url, target);
++	char *url = NULL, *target = NULL;
++	bool hasExtensions = ParseURLExtensions (aURL, &url, &target);
+ 
+ 	D ("SetHref '%s' has-extensions %d (url: '%s' target: '%s')",
+-	   nsCString (aURL).get (), hasExtensions, url.get (), target.get ());
++	   aURL ? aURL : "", hasExtensions, url ? url : "", target ? target : "");
+ 
+-	nsresult rv;
+-	nsIURI *baseURI;
++#if 0
++// 	nsresult rv = NS_OK;
++	char *baseURI;
+ 	if (mQtsrcURI) {
+ 		baseURI = mQtsrcURI;
+ 	} else if (mSrcURI) {
+@@ -1387,50 +1318,67 @@
+ 	} else {
+ 		baseURI = mBaseURI;
+ 	}
++#endif
+ 
+ 	if (hasExtensions) {
++                g_free (mHref);
++                mHref = g_strdup (url && url[0] ? url : NULL);
++#if 0
+ 		rv = baseURI->Resolve (url, mHref);
+-
+-		if (!target.IsEmpty ())
+-			mTarget = target;
++#endif
++                g_free (mTarget);
++                mTarget = g_strdup (target);
+ 	} else {
++                g_free (mHref);
++                mHref = g_strdup (aURL && aURL[0] ? aURL : NULL);
++#if 0
+ 		rv = baseURI->Resolve (aURL, mHref);
++#endif
++
++                g_free (mTarget);
++                mTarget = NULL;
+ 	}
++#if 0
+ 	if (NS_SUCCEEDED (rv)) {
+-		D ("Resolved HREF '%s'", mHref.get());
++		D ("Resolved HREF '%s'", mHref ? mHref : "");
+ 	} else {
+ 		D ("Failed to resolve HREF (rv=%x)", rv);
+-		mHref = hasExtensions ? url : aURL; /* save unresolved HREF */
++		mHref = hasExtensions ? g_strdup (url) : g_strdup (aURL); /* save unresolved HREF */
+ 	}
++#endif
++
++        g_free (url);
++        g_free (target);
+ 
+-	return rv;
++	return true; // FIXMEchpe
+ }
+ 
+-PRBool
+-totemPlugin::ParseURLExtensions (const nsACString &aString,
+-				 nsACString &_url,
+-				 nsACString &_target)
++bool
++totemPlugin::ParseURLExtensions (const char *str,
++				 char **_url,
++				 char **_target)
+ {
+-	const nsCString string (aString);
++        if (!str || !str[0])
++                return false;
+ 
+-	const char *str = string.get ();
++        /* FIXMEchpe allo whitespace in front? */
+ 	if (str[0] != '<')
+-		return PR_FALSE;
++		return false;
+ 
+ 	/* The expected form is "<URL> T<target> E<name=value pairs>".
+ 	 * But since this is untrusted input from the web, we'll make sure it conforms to this!
+ 	 */
+ 	const char *end = strchr (str, '>');
+ 	if (!end)
+-		return PR_FALSE;
++		return false;
+ 
+-	_url = nsDependentCSubstring (string, 1, PRUint32 (end - str - 1));
++	*_url = g_strndup (str + 1, end - str - 1);
+ 
+ 	const char *ext = strstr (end, " T<");
+ 	if (ext) {
+ 		const char *extend = strchr (ext, '>');
+ 		if (extend) {
+-			_target = nsDependentCSubstring (ext + 3, PRUint32 (extend - ext - 3));
++                        *_target = g_strndup (ext + 3, extend - ext - 3);
+ 		}
+ 	}
+ 
+@@ -1444,7 +1392,7 @@
+ 	}
+ #endif
+ 
+-	return PR_TRUE;
++	return true;
+ }
+ 
+ #endif /* TOTEM_NARROWSPACE_PLUGIN */
+@@ -1656,41 +1604,29 @@
+ 	 * FIXME: This might be possible on gecko trunk by returning an
+  	 * error code from the NewStream function.
+ 	 */
+-
+-	NPError err;
+-	err = CallNPN_GetValueProc (sNPN.getvalue,
+-				    mInstance, NPNVserviceManager,
+-				    reinterpret_cast<void *>
+-                        (reinterpret_cast<void **>(&mServiceManager)));
+-	if (err != NPERR_NO_ERROR || !mServiceManager) {
+-		D ("Failed to get the service manager");
+-		return NPERR_GENERIC_ERROR;
+-	}
+-
+ 	nsresult rv;
+-	rv = mServiceManager->GetServiceByContractID (NS_IOSERVICE_CONTRACTID,
+-						      NS_GET_IID (nsIIOService),
+-						      reinterpret_cast<void **>(&mIOService));
+-	if (NS_FAILED (rv) || !mIOService) {
+-		D ("Failed to get IO service");
+-		return NPERR_GENERIC_ERROR;
++	rv = NS_GetServiceManager (getter_AddRefs (mServiceManager));
++	if (NS_FAILED (rv) || !mServiceManager) {
++		D ("Failed to get the service manager");
++		return NPERR_GENERIC_ERROR;		
+ 	}
+ 
+-	err = CallNPN_GetValueProc (sNPN.getvalue,
+-				    mInstance, NPNVDOMElement,
+-				    reinterpret_cast<void *>
+-                        (reinterpret_cast<void **>(&mPluginDOMElement)));
+-	if (err != NPERR_NO_ERROR || !mPluginDOMElement) {
+-		D ("Failed to get our DOM Element");
++	NPError err;
++	err = NPN_GetValue (mInstance, NPNVPluginElementNPObject,
++			    getter_Retains (mPluginElement));
++	if (err != NPERR_NO_ERROR || mPluginElement.IsNull ()) {
++		D ("Failed to get our DOM Element NPObject");
+ 		return NPERR_GENERIC_ERROR;
+ 	}
+ 
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+-	rv = mPluginDOMElement->GetOwnerDocument (&mPluginOwnerDocument);
+-	if (NS_FAILED (rv) || !mPluginOwnerDocument) {
+-		D ("Plugin in a document!?");
++        if (!NPN_GetProperty (mInstance,
++                              mPluginElement,
++                              NPN_GetStringIdentifier ("ownerDocument"),
++                              getter_Retains (mPluginOwnerDocument)) ||
++            mPluginOwnerDocument.IsNull ()) {
++		D ("Failed to get the plugin element's ownerDocument");
+ 		return NPERR_GENERIC_ERROR;
+-	}
+ #endif /* TOTEM_COMPLEX_PLUGIN */
+ 
+ 	/* We'd like to get the base URI of our DOM element as a nsIURI,
+@@ -1698,32 +1634,20 @@
+ 	 * for non-MOZILLA_INTERNAL_API code). nsIDOM3Node isn't frozen either,
+ 	 * but should be safe enough.
+ 	 */
+-	nsIDOM3Node *dom3Node = nsnull;
+-	rv = CallQueryInterface (mPluginDOMElement, &dom3Node);
+-	if (NS_FAILED (rv) || !dom3Node) {
+-		D ("Failed to QI the DOM element to nsIDOM3Node");
+-		return NPERR_GENERIC_ERROR;
+-	}
+-
+-        /* FIXME: can we cache this, or can it change (so we'll need to re-get every time we use it)? */
+-	nsString baseASpec;
+-	rv = dom3Node->GetBaseURI (baseASpec);
+-	if (NS_FAILED (rv) || baseASpec.IsEmpty ()) {
+-		/* We can't go on without a base URI ! */
+-		D ("Failed to get base URI spec");
+-		return NPERR_GENERIC_ERROR;
+-	}
+-
+-	NS_ConvertUTF16toUTF8 baseSpec (baseASpec);
+ 
+-	D ("Base URI is '%s'", baseSpec.get ());
++        /* This is a property on nsIDOM3Node */
++        totemNPVariantWrapper baseURI;
++        if (!NPN_GetProperty (mInstance,
++                              mPluginElement,
++                              NPN_GetStringIdentifier ("baseURI"),
++                              getter_Copies (baseURI)) ||
++            !baseURI.IsString ()) {
++          D ("Failed to get the base URI");
++          return NPERR_GENERIC_ERROR;
++        }
+ 
+-	rv = mIOService->NewURI (baseSpec, nsnull /* FIXME: use document charset */,
+-				 nsnull, &mBaseURI);
+-	if (NS_FAILED (rv) || !mBaseURI) {
+-		D ("Failed to construct base URI");
+-		return NPERR_GENERIC_ERROR;
+-	}
++        mBaseURI = g_strdup (baseURI.GetString ());
++	D ("Base URI is '%s'", mBaseURI ? mBaseURI : "");
+ 
+         /* Create timer */
+         nsIComponentManager *compMan = nsnull;
+@@ -1866,7 +1790,7 @@
+ 	if (!filename)
+ 		filename = (const char *) g_hash_table_lookup (args, "url");
+ 	if (filename) {
+-		SetURL (nsDependentCString (filename));
++		SetURL (filename);
+ 	}
+ #endif /* TOTEM_GMP_PLUGIN */
+ 
+@@ -1874,18 +1798,18 @@
+ 	/* Target */
+ 	value = (const char *) g_hash_table_lookup (args, "target");
+ 	if (value) {
+-		mTarget.Assign (value);
++		mTarget = g_strdup (value);
+ 	}
+ 
+ 	href = (const char *) g_hash_table_lookup (args, "href");
+ 	if (href) {
+-		SetHref (nsDependentCString (href));
++		SetHref (href);
+ 	}
+ 
+ 	/* http://developer.apple.com/documentation/QuickTime/QT6WhatsNew/Chap1/chapter_1_section_13.html */
+ 	qtsrc = (const char *) g_hash_table_lookup (args, "qtsrc");
+ 	if (qtsrc) {
+-		SetQtsrc (nsDependentCString (qtsrc));
++		SetQtsrc (qtsrc);
+ 	}
+ #endif /* TOTEM_NARROWSPACE_PLUGIN */
+ 
+@@ -1913,7 +1837,8 @@
+ 
+ 	/* If we're set to start automatically, we'll use the src stream */
+ 	if (mRequestURI &&
+-	    mRequestURI == mSrcURI) {
++            mSrcURI &&
++            strcmp (mRequestURI, mSrcURI) == 0) {
+ 		mExpectingStream = mAutostart;
+ 	}
+ 
+@@ -2018,14 +1943,14 @@
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+ 	/* We need to autostart if we're using an HREF
+ 	 * otherwise the start image isn't shown */
+-	if (!mHref.IsEmpty ()) {
++	if (mHref) {
+ 		mExpectingStream = PR_TRUE;
+ 		mAutostart = PR_TRUE;
+ 	}
+ #endif /* TOTEM_NARROWSPACE_PLUGIN */
+ 
+ 	/* Dump some disagnostics */
+-	D ("mSrc: %s", mSrc.get ());
++	D ("mSrc: %s", mSrc);
+ 	D ("mCache: %d", mCache);
+ 	D ("mControllerHidden: %d", mControllerHidden);
+ 	D ("mShowStatusbar: %d", mShowStatusbar);
+@@ -2033,8 +1958,8 @@
+ 	D ("mAudioOnly: %d", mAudioOnly);
+ 	D ("mAutostart: %d, mRepeat: %d", mAutostart, mRepeat);
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+-	D ("mHref: %s", mHref.get ());
+-	D ("mTarget: %s", mTarget.get ());
++	D ("mHref: %s", mHref);
++	D ("mTarget: %s", mTarget);
+ #endif /* TOTEM_NARROWSPACE_PLUGIN */
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+ 	D ("mConsole: %s", mConsole.get ());
+@@ -2095,10 +2020,9 @@
+ 		 * since, using gecko trunk (1.9), this causes the plugin to be destroyed,
+ 		 * if this is the automatic |src| stream. Same for the other calls below.
+ 		 */
+-		return CallNPN_DestroyStreamProc (sNPN.destroystream,
+-						  mInstance,
+-						  stream,
+-						  NPRES_DONE);
++		return NPN_DestroyStream (mInstance,
++					stream,
++					NPRES_DONE);
+ 	}
+ 
+ 	/* Either:
+@@ -2111,10 +2035,9 @@
+ 	if (!mExpectingStream) {
+ 		D ("Not expecting a new stream; aborting stream");
+ 
+-		return CallNPN_DestroyStreamProc (sNPN.destroystream,
+-						  mInstance,
+-						  stream,
+-						  NPRES_DONE);
++		return NPN_DestroyStream (mInstance,
++					stream,
++					NPRES_DONE);
+ 	}
+ 
+ 	/* This was an expected stream, no more expected */
+@@ -2131,10 +2054,9 @@
+ 	if (!mViewerReady) {
+ 		D ("Viewer not ready, aborting stream");
+ 
+-		return CallNPN_DestroyStreamProc (sNPN.destroystream,
+-						  mInstance,
+-						  stream,
+-						  NPRES_DONE);
++		return NPN_DestroyStream (mInstance,
++					stream,
++					NPRES_DONE);
+ 	}
+ #endif
+ 
+@@ -2270,10 +2192,9 @@
+ 			/* fd://0 got closed, probably because the backend
+ 			 * crashed on us. Destroy the stream.
+ 			 */
+-			if (CallNPN_DestroyStreamProc (sNPN.destroystream,
+-			    			       mInstance,
+-						       mStream,
+-						       NPRES_DONE) != NPERR_NO_ERROR) {
++			if (NPN_DestroyStream (mInstance,
++					mStream,
++					NPRES_DONE) != NPERR_NO_ERROR) {
+ 				g_warning ("Couldn't destroy the stream");
+ 			}
+ 		}
+@@ -2311,11 +2232,8 @@
+ 	NS_ASSERTION (mViewerProxy, "No viewer proxy");
+ 	NS_ASSERTION (mViewerReady, "Viewer not ready");
+ 
+-	NS_ENSURE_TRUE (mRequestBaseURI && mRequestURI, );
+-
+-	nsCString baseSpec, spec;
+-	mRequestBaseURI->GetSpec (baseSpec);
+-	mRequestURI->GetSpec (spec);
++        if (!mRequestBaseURI || !mRequestURI)
++          return;
+ 
+ 	/* FIXME: these calls need to be async!!
+ 	 * But the file may be unlinked as soon as we return from this
+@@ -2328,8 +2246,8 @@
+ 					    "SetPlaylist",
+ 					    &error,
+ 					    G_TYPE_STRING, fname,
+-					    G_TYPE_STRING, spec.get (),
+-					    G_TYPE_STRING, baseSpec.get (),
++					    G_TYPE_STRING, mRequestURI,
++					    G_TYPE_STRING, mRequestBaseURI,
+ 					    G_TYPE_INVALID,
+ 					    G_TYPE_INVALID);
+ 	}
+@@ -2342,8 +2260,8 @@
+ 					    "SetLocalFile",
+ 					    &error,
+ 					    G_TYPE_STRING, fname,
+-					    G_TYPE_STRING, spec.get (),
+-					    G_TYPE_STRING, baseSpec.get (),
++					    G_TYPE_STRING, mRequestURI,
++					    G_TYPE_STRING, mRequestBaseURI,
+ 					    G_TYPE_INVALID,
+ 					    G_TYPE_INVALID);
+ 	}
+Index: totem-2.22.1/browser-plugin/totemPlugin.h
+===================================================================
+--- totem-2.22.1.orig/browser-plugin/totemPlugin.h	2010-06-24 21:44:49.210070606 +0100
++++ totem-2.22.1/browser-plugin/totemPlugin.h	2010-06-24 22:36:34.680070146 +0100
+@@ -28,6 +28,13 @@
+ #include <npapi.h>
+ 
+ #include <nsStringAPI.h>
++#include <nsCOMPtr.h>
++#include <nsXPCOM.h>
++
++#include "totemNPClass.h"
++#include "totemNPObject.h"
++#include "totemNPObjectWrapper.h"
++#include "totemNPVariantWrapper.h"
+ 
+ #ifdef NEED_STRING_GLUE
+ #include "totemStringGlue.h"
+@@ -39,12 +46,7 @@
+ 
+ #include "totem-plugin-viewer-constants.h"
+ 
+-class nsIDOMDocument;
+-class nsIDOMElement;
+-class nsIIOService;
+-class nsIServiceManager;
+ class nsITimer;
+-class nsIURI;
+ class nsVoidArray;
+ class totemScriptablePlugin;
+ struct _NPNetscapeFuncs;
+@@ -66,9 +68,6 @@
+ 
+     nsresult SetSrc (const nsACString &aURL);
+ 
+-    /* plugin glue */
+-    static _NPNetscapeFuncs sNPN;
+-
+     static NPError Initialise ();
+     static NPError Shutdown ();
+ 
+@@ -160,7 +159,7 @@
+ 
+     PRBool IsMimeTypeSupported (const char *aMimeType,
+ 				const char *aURL);
+-    PRBool IsSchemeSupported (nsIURI *aURI);
++    bool IsSchemeSupported (const char *aURI, const char *aBaseURI);
+     void GetRealMimeType (const char *aMimeType,
+ 			  nsACString &_retval);
+     PRBool ParseBoolean (const char *key,
+@@ -179,14 +178,13 @@
+ 
+     /* FIXME make these use nsCOMPtr<> !! */
+     totemScriptablePlugin *mScriptable;
+-    nsIServiceManager *mServiceManager;
+-    nsIIOService *mIOService;
+-    nsIDOMElement *mPluginDOMElement;
++    nsCOMPtr<nsIServiceManager> mServiceManager;
++    totemNPObjectWrapper mPluginElement;
+     nsITimer *mTimer;
+-    nsIURI *mBaseURI;
++    char *mBaseURI;
+ 
+-    nsIURI *mRequestBaseURI;
+-    nsIURI *mRequestURI;
++    char *mRequestBaseURI;
++    char *mRequestURI;
+ 
+     /* Stream data */
+     NPStream *mStream;
+@@ -198,8 +196,8 @@
+ 
+     nsCString mMimeType;
+ 
+-    nsCString mSrc;
+-    nsIURI *mSrcURI;
++    char *mSrc;
++    char *mSrcURI;
+ 
+     Window mWindow;
+     PRInt32 mWidth;
+@@ -223,31 +221,31 @@
+ 
+ #ifdef TOTEM_GMP_PLUGIN
+   public:
+-    nsresult SetURL (const nsACString &aURL);
++    void SetURL (const char *aURL);
+ 
+   private:
+-    nsIURI *mURLURI;
++    char *mURLURI;
+ #endif
+ 
+ #ifdef TOTEM_NARROWSPACE_PLUGIN
+   public:
+-    nsresult SetQtsrc (const nsCString &aURL);
+-    nsresult SetHref (const nsCString& aURL);
++    bool SetQtsrc (const char *aURL);
++    bool SetHref (const char *aURL);
+ 
+   private:
+-    PRBool ParseURLExtensions (const nsACString &aString,
+-			       nsACString &_url,
+-			       nsACString &_target);
++    bool ParseURLExtensions (const char *str,
++			       char **_url,
++			       char **_target);
+ 
+     void LaunchTotem (const nsCString &aURL,
+ 		      PRUint32 aTimestamp);
+ 
+-    nsIURI *mQtsrcURI;
++    char *mQtsrcURI;
+ 
+-    nsCString mHref;
+-    nsIURI *mHrefURI;
++    char *mHref;
++    char *mHrefURI;
+ 
+-    nsCString mTarget;
++    char *mTarget;
+ #endif
+ 
+ #if defined(TOTEM_COMPLEX_PLUGIN) && defined(HAVE_NSTARRAY_H)
+@@ -264,7 +262,7 @@
+     void UnownedViewerSetWindow ();
+     void UnownedViewerUnsetWindow ();
+ 
+-    nsIDOMDocument *mPluginOwnerDocument;
++    totemNPObjectWrapper mPluginOwnerDocument;
+     nsCString mConsole;
+     nsCString mControls;
+ 
+Index: totem-2.22.1/browser-plugin/totemNPObjectWrapper.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPObjectWrapper.h	2010-06-24 22:36:34.680070146 +0100
+@@ -0,0 +1,116 @@
++/*
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __TOTEM_NPOBJECT_WRAPPER_H__
++#define __TOTEM_NPOBJECT_WRAPPER_H__
++
++#include <npapi.h>
++#include <npruntime.h>
++
++#include <assert.h>
++
++class totemNPObjectWrapper {
++
++  public:
++
++    totemNPObjectWrapper () : mObject (0) { }
++    totemNPObjectWrapper (NPObject *aObject) : mObject (aObject) { } /* adopts */
++    totemNPObjectWrapper (const totemNPObjectWrapper& aOther) { Assign (aOther.mObject); }
++
++    ~totemNPObjectWrapper () { Assign (0); }
++
++    bool IsNull () const { return mObject == 0; }
++
++    totemNPObjectWrapper& operator= (NPObject *aObject) { Assign (aObject); return *this; }
++
++    operator void*() const { return reinterpret_cast<void*>(mObject); }
++    operator NPObject*() const { return mObject; }
++    NPObject* operator->() const { assert (!IsNull ()); return mObject; }
++
++    class GetterRetains {
++      public:
++       explicit GetterRetains (totemNPObjectWrapper& aTarget) : mTarget (aTarget) { VOID_TO_NPVARIANT (mVariant); }
++        ~GetterRetains () {
++          if (!NPVARIANT_IS_VOID (mVariant)) {
++            if (NPVARIANT_IS_OBJECT (mVariant)) {
++              mTarget = NPVARIANT_TO_OBJECT (mVariant);
++            }
++            NPN_ReleaseVariantValue (&mVariant);
++          }
++       }
++
++       operator void**() { return reinterpret_cast<void**> (mTarget.StartAssignment ()); } // FIXMEchpe this looks wrong...
++       operator NPObject**() { return mTarget.StartAssignment (); }
++       operator NPVariant*() { return &mVariant; }
++
++       /* NPN_GetValue uses void* which is broken */
++       operator void*() { return reinterpret_cast<void*> (mTarget.StartAssignment ()); }
++
++      private:
++        totemNPObjectWrapper& mTarget;
++        NPVariant mVariant;
++    };
++
++    class AlreadyRetained {
++      public:
++        explicit AlreadyRetained (NPObject *aObject) : mObject (aObject) { }
++        ~AlreadyRetained () { }
++
++        NPObject *Get () const { return mObject; }
++      private:
++        NPObject *mObject;
++    };
++
++    totemNPObjectWrapper& operator= (const AlreadyRetained& aRetainer) { Adopt (aRetainer.Get()); return *this; }
++
++  protected:
++
++    totemNPObjectWrapper& operator= (const totemNPObjectWrapper&); // not implemented
++
++    void Assign (NPObject *aObject) {
++      if (mObject) {
++        NPN_ReleaseObject (mObject);
++      }
++
++      mObject = aObject;
++      if (mObject) {
++        NPN_RetainObject (mObject);
++      }
++    }
++
++    void Adopt (NPObject *aObject) {
++      if (mObject) {
++        NPN_ReleaseObject (mObject);
++      }
++
++      mObject = aObject;
++    }
++
++    NPObject** StartAssignment () { Assign (0); return &mObject; }
++
++    NPObject *mObject;
++};
++
++inline totemNPObjectWrapper::GetterRetains
++getter_Retains (totemNPObjectWrapper &aTarget)
++{
++  return totemNPObjectWrapper::GetterRetains (aTarget);
++}
++
++#endif /* __TOTEM_NPOBJECT_WRAPPER_H__ */
+Index: totem-2.22.1/browser-plugin/totemNPVariantWrapper.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPVariantWrapper.h	2010-06-24 22:36:34.680070146 +0100
+@@ -0,0 +1,112 @@
++/*
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __TOTEM_NPVARIANT_WRAPPER_H__
++#define __TOTEM_NPVARIANT_WRAPPER_H__
++
++#include <assert.h>
++#include <string.h>
++
++#include "npapi.h"
++#include "npruntime.h"
++
++class totemNPVariantWrapper {
++
++  public:
++
++    totemNPVariantWrapper ()                  : mOwned (false) { VOID_TO_NPVARIANT (mVariant); }
++    totemNPVariantWrapper (bool aValue)       : mOwned (false) { BOOLEAN_TO_NPVARIANT (aValue, mVariant); }
++    totemNPVariantWrapper (uint32_t aValue)   : mOwned (false) { INT32_TO_NPVARIANT (aValue, mVariant);   }
++    totemNPVariantWrapper (double aValue)     : mOwned (false) { DOUBLE_TO_NPVARIANT (aValue, mVariant);  }
++    totemNPVariantWrapper (char *aValue)      : mOwned (false) { STRINGZ_TO_NPVARIANT (aValue, mVariant); }
++//     totemNPVariantWrapper (NPString *aValue)  : mOwned (false) { STRINGN_TO_NPVARIANT (aValue, mVariant); }
++    totemNPVariantWrapper (NPObject *aObject) : mOwned (false) { OBJECT_TO_NPVARIANT (aObject, mVariant); }
++
++    totemNPVariantWrapper (const totemNPVariantWrapper& aOther) : mVariant (aOther.mVariant), mOwned (false) { }
++
++    ~totemNPVariantWrapper () { Clear (); }
++
++    bool IsVoid    () const { return NPVARIANT_IS_VOID (mVariant);    }
++    bool IsNull    () const { return NPVARIANT_IS_NULL (mVariant);    }
++    bool IsBoolean () const { return NPVARIANT_IS_BOOLEAN (mVariant); }
++    bool IsInt32   () const { return NPVARIANT_IS_INT32 (mVariant);   }
++    bool IsDouble  () const { return NPVARIANT_IS_DOUBLE (mVariant);  }
++    bool IsString  () const { return NPVARIANT_IS_STRING (mVariant);  }
++    bool IsObject  () const { return NPVARIANT_IS_OBJECT (mVariant);  }
++
++    bool      GetBoolean  () const { return NPVARIANT_TO_BOOLEAN (mVariant); }
++    uint32_t  GetInt32    () const { return NPVARIANT_TO_INT32 (mVariant);   }
++    double    GetDouble   () const { return NPVARIANT_TO_DOUBLE (mVariant);  }
++    char *    GetString   () const { return (char *) NPVARIANT_TO_STRING (mVariant).UTF8Characters;  }
++    NPString  GetNPString () const { return NPVARIANT_TO_STRING (mVariant);  }
++    NPObject* GetObject   () const { return NPVARIANT_TO_OBJECT (mVariant);  }
++
++    void SetVoid    ()                  { Clear (); VOID_TO_NPVARIANT (mVariant);            }
++    void SetNull    ()                  { Clear (); NULL_TO_NPVARIANT (mVariant);            }
++    void SetBoolean (bool aValue)       { Clear (); BOOLEAN_TO_NPVARIANT (aValue, mVariant); }
++    void SetInt32   (uint32_t aValue)   { Clear (); INT32_TO_NPVARIANT (aValue, mVariant);   }
++    void SetDouble  (double aValue)     { Clear (); DOUBLE_TO_NPVARIANT (aValue, mVariant);  }
++    void SetString  (char *aValue)      { Clear (); STRINGZ_TO_NPVARIANT (aValue, mVariant); }
++//     void SetString  (NPString *aValue)  { Clear (); STRINGN_TO_NPVARIANT (aValue, mVariant); }
++    void SetObject  (NPObject *aObject) { Clear (); OBJECT_TO_NPVARIANT (aObject, mVariant); }
++
++    operator char*     () { return GetString   (); }
++    operator NPString  () { return GetNPString (); }
++    operator NPObject* () { return GetObject   (); }
++
++    operator NPVariant*() { return &mVariant; }
++    
++    class GetterCopies {
++      public:
++       explicit GetterCopies (totemNPVariantWrapper& aTarget) : mTarget (aTarget) { }
++        ~GetterCopies () { }
++
++       operator NPVariant*() { return mTarget.StartAssignment (); }
++
++      private:
++        totemNPVariantWrapper& mTarget;
++    };
++
++  private:
++
++    totemNPVariantWrapper& operator= (const totemNPVariantWrapper&); // not implemented
++
++    void Clear () {
++      if (mOwned) {
++        NPN_ReleaseVariantValue (&mVariant);
++        mOwned = false;
++      } else {
++        VOID_TO_NPVARIANT (mVariant);
++      }
++    }
++
++    NPVariant* StartAssignment () { Clear (); mOwned = true; return &mVariant; }
++
++  protected:
++    NPVariant mVariant;
++    bool mOwned;
++};
++
++inline totemNPVariantWrapper::GetterCopies
++getter_Copies (totemNPVariantWrapper &aTarget)
++{
++  return totemNPVariantWrapper::GetterCopies (aTarget);
++}
++
++#endif /* __TOTEM_NPVARIANT_WRAPPER_H__ */
+Index: totem-2.22.1/browser-plugin/Makefile.am
+===================================================================
+--- totem-2.22.1.orig/browser-plugin/Makefile.am	2010-06-24 21:44:49.200077367 +0100
++++ totem-2.22.1/browser-plugin/Makefile.am	2010-06-24 22:36:34.730376538 +0100
+@@ -109,6 +109,7 @@
+ 	$(DBUS_CFLAGS)		\
+ 	$(NVTV_CFLAGS)		\
+ 	$(SN_CFLAGS)		\
++	$(GIO_CFLAGS)		\
+ 	$(AM_CFLAGS)
+ 
+ totem_plugin_viewer_LDADD =						\
+@@ -122,7 +123,8 @@
+ 	$(DBUS_LIBS)		\
+ 	$(NVTV_LIBS) 		\
+ 	$(XTEST_LIBS)		\
+-	$(X_LIBS)
++	$(X_LIBS)		\
++	$(GIO_LIBS)
+ 
+ BUILT_SOURCES += \
+ 	totem-plugin-viewer-interface.h
+@@ -140,6 +142,13 @@
+ plugin_LTLIBRARIES += libtotem-basic-plugin.la
+ 
+ libtotem_basic_plugin_la_SOURCES =	\
++	totemNPNGlue.cpp		\
++	totemNPClass.cpp		\
++	totemNPClass.h			\
++	totemNPObject.cpp		\
++	totemNPObject.h			\
++	totemNPObjectWrapper.h		\
++	totemNPVariantWrapper.h		\
+ 	totemDebug.h			\
+ 	totemPluginGlue.cpp		\
+ 	totemPluginGlue.h		\
+@@ -200,6 +209,13 @@
+ plugin_LTLIBRARIES += libtotem-gmp-plugin.la
+ 
+ libtotem_gmp_plugin_la_SOURCES =	\
++	totemNPNGlue.cpp		\
++	totemNPClass.cpp		\
++	totemNPClass.h			\
++	totemNPObject.cpp		\
++	totemNPObject.h			\
++	totemNPObjectWrapper.h		\
++	totemNPVariantWrapper.h		\
+ 	totemDebug.h			\
+ 	totemGMPError.cpp		\
+ 	totemGMPError.h			\
+@@ -266,6 +282,13 @@
+ plugin_LTLIBRARIES += libtotem-complex-plugin.la
+ 
+ libtotem_complex_plugin_la_SOURCES =	\
++	totemNPNGlue.cpp		\
++	totemNPClass.cpp		\
++	totemNPClass.h			\
++	totemNPObject.cpp		\
++	totemNPObject.h			\
++	totemNPObjectWrapper.h		\
++	totemNPVariantWrapper.h		\
+ 	totemDebug.h			\
+ 	totemPluginGlue.cpp		\
+ 	totemPluginGlue.h		\
+@@ -326,6 +349,13 @@
+ plugin_LTLIBRARIES += libtotem-narrowspace-plugin.la
+ 
+ libtotem_narrowspace_plugin_la_SOURCES = \
++	totemNPNGlue.cpp		\
++	totemNPClass.cpp		\
++	totemNPClass.h			\
++	totemNPObject.cpp		\
++	totemNPObject.h			\
++	totemNPObjectWrapper.h		\
++	totemNPVariantWrapper.h		\
+ 	totemDebug.h			\
+ 	totemPluginGlue.cpp		\
+ 	totemPluginGlue.h		\
+@@ -386,6 +416,13 @@
+ plugin_LTLIBRARIES += libtotem-mully-plugin.la
+ 
+ libtotem_mully_plugin_la_SOURCES =	\
++	totemNPNGlue.cpp		\
++	totemNPClass.cpp		\
++	totemNPClass.h			\
++	totemNPObject.cpp		\
++	totemNPObject.h			\
++	totemNPObjectWrapper.h		\
++	totemNPVariantWrapper.h		\
+ 	totemDebug.h			\
+ 	totemPluginGlue.cpp		\
+ 	totemPluginGlue.h		\
+@@ -446,6 +483,13 @@
+ plugin_LTLIBRARIES += libtotem-cone-plugin.la
+ 
+ libtotem_cone_plugin_la_SOURCES =	\
++	totemNPNGlue.cpp		\
++	totemNPClass.cpp		\
++	totemNPClass.h			\
++	totemNPObject.cpp		\
++	totemNPObject.h			\
++	totemNPObjectWrapper.h		\
++	totemNPVariantWrapper.h		\
+ 	totemDebug.h			\
+ 	totemPluginGlue.cpp		\
+ 	totemPluginGlue.h		\
+Index: totem-2.22.1/browser-plugin/totemNPNGlue.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPNGlue.cpp	2010-06-24 22:36:34.730376538 +0100
+@@ -0,0 +1,292 @@
++/*
++ * Copyright © 1998 Netscape Communications Corporation.
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ *
++ * ===========================================================================
++ * Derived from MPL/LGPL/GPL tri-licensed code
++ * [mozilla/odules/plugin/samples/4x-scriptable/npn_gate.cpp];
++ * used here under LGPL 2+, as permitted by the relicensing clause.
++ *
++ * The Original Code is mozilla.org code.
++ *
++ * The Initial Developer of the Original Code is
++ * Netscape Communications Corporation.
++ * Portions created by the Initial Developer are Copyright © 1998
++ * the Initial Developer. All Rights Reserved.
++ */
++
++#include <config.h>
++
++#include <string.h>
++
++#include "npfunctions.h"
++
++#ifndef HIBYTE
++#define HIBYTE(x) ((((uint32_t)(x)) & 0xff00) >> 8)
++#endif
++
++#ifndef LOBYTE
++#define LOBYTE(W) ((W) & 0xFF)
++#endif
++
++extern NPNetscapeFuncs NPNFuncs;
++
++void NPN_Version(int* plugin_major, int* plugin_minor, int* netscape_major, int* netscape_minor)
++{
++  *plugin_major   = NP_VERSION_MAJOR;
++  *plugin_minor   = NP_VERSION_MINOR;
++  *netscape_major = HIBYTE(NPNFuncs.version);
++  *netscape_minor = LOBYTE(NPNFuncs.version);
++}
++
++NPError NPN_GetURLNotify(NPP instance, const char *url, const char *target, void* notifyData)
++{
++  return NPNFuncs.geturlnotify(instance, url, target, notifyData);
++}
++
++NPError NPN_GetURL(NPP instance, const char *url, const char *target)
++{
++  return NPNFuncs.geturl(instance, url, target);
++}
++
++NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData)
++{
++  return NPNFuncs.posturlnotify(instance, url, window, len, buf, file, notifyData);
++}
++
++NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file)
++{
++  return NPNFuncs.posturl(instance, url, window, len, buf, file);
++} 
++
++NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)
++{
++  return NPNFuncs.requestread(stream, rangeList);
++}
++
++NPError NPN_NewStream(NPP instance, NPMIMEType type, const char* target, NPStream** stream)
++{
++  return NPNFuncs.newstream(instance, type, target, stream);
++}
++
++int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer)
++{
++  return NPNFuncs.write(instance, stream, len, buffer);
++}
++
++NPError NPN_DestroyStream(NPP instance, NPStream* stream, NPError reason)
++{
++  return NPNFuncs.destroystream(instance, stream, reason);
++}
++
++void NPN_Status(NPP instance, const char *message)
++{
++  NPNFuncs.status(instance, message);
++}
++
++const char* NPN_UserAgent(NPP instance)
++{
++  return NPNFuncs.uagent(instance);
++}
++
++void* NPN_MemAlloc(uint32_t size)
++{
++  return NPNFuncs.memalloc(size);
++}
++
++void NPN_MemFree(void* ptr)
++{
++  /* Make it null-safe */
++  if (!ptr)
++    return;
++
++  NPNFuncs.memfree(ptr);
++}
++
++uint32_t NPN_MemFlush(uint32_t size)
++{
++  return NPNFuncs.memflush(size);
++}
++
++void NPN_ReloadPlugins(NPBool reloadPages)
++{
++  NPNFuncs.reloadplugins(reloadPages);
++}
++
++NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value)
++{
++  return NPNFuncs.getvalue(instance, variable, value);
++}
++
++NPError NPN_SetValue(NPP instance, NPPVariable variable, void *value)
++{
++  return NPNFuncs.setvalue(instance, variable, value);
++}
++
++void NPN_InvalidateRect(NPP instance, NPRect *invalidRect)
++{
++  NPNFuncs.invalidaterect(instance, invalidRect);
++}
++
++void NPN_InvalidateRegion(NPP instance, NPRegion invalidRegion)
++{
++  NPNFuncs.invalidateregion(instance, invalidRegion);
++}
++
++void NPN_ForceRedraw(NPP instance)
++{
++  NPNFuncs.forceredraw(instance);
++}
++
++NPIdentifier NPN_GetStringIdentifier(const NPUTF8 *name)
++{
++  return NPNFuncs.getstringidentifier(name);
++}
++
++void NPN_GetStringIdentifiers(const NPUTF8 **names, int32_t nameCount,
++                              NPIdentifier *identifiers)
++{
++  return NPNFuncs.getstringidentifiers(names, nameCount, identifiers);
++}
++
++NPIdentifier NPN_GetStringIdentifier(int32_t intid)
++{
++  return NPNFuncs.getintidentifier(intid);
++}
++
++bool NPN_IdentifierIsString(NPIdentifier identifier)
++{
++  return NPNFuncs.identifierisstring(identifier);
++}
++
++NPUTF8 *NPN_UTF8FromIdentifier(NPIdentifier identifier)
++{
++  return NPNFuncs.utf8fromidentifier(identifier);
++}
++
++int32_t NPN_IntFromIdentifier(NPIdentifier identifier)
++{
++  return NPNFuncs.intfromidentifier(identifier);
++}
++
++NPObject *NPN_CreateObject(NPP npp, NPClass *aClass)
++{
++  return NPNFuncs.createobject(npp, aClass);
++}
++
++NPObject *NPN_RetainObject(NPObject *obj)
++{
++  return NPNFuncs.retainobject(obj);
++}
++
++void NPN_ReleaseObject(NPObject *obj)
++{
++  return NPNFuncs.releaseobject(obj);
++}
++
++bool NPN_Invoke(NPP npp, NPObject* obj, NPIdentifier methodName,
++                const NPVariant *args, uint32_t argCount, NPVariant *result)
++{
++  return NPNFuncs.invoke(npp, obj, methodName, args, argCount, result);
++}
++
++bool NPN_InvokeDefault(NPP npp, NPObject* obj, const NPVariant *args,
++                       uint32_t argCount, NPVariant *result)
++{
++  return NPNFuncs.invokeDefault(npp, obj, args, argCount, result);
++}
++
++bool NPN_Evaluate(NPP npp, NPObject* obj, NPString *script,
++                  NPVariant *result)
++{
++  return NPNFuncs.evaluate(npp, obj, script, result);
++}
++
++bool NPN_GetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
++                     NPVariant *result)
++{
++  return NPNFuncs.getproperty(npp, obj, propertyName, result);
++}
++
++bool NPN_SetProperty(NPP npp, NPObject* obj, NPIdentifier propertyName,
++                     const NPVariant *value)
++{
++  return NPNFuncs.setproperty(npp, obj, propertyName, value);
++}
++
++bool NPN_RemoveProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
++{
++  return NPNFuncs.removeproperty(npp, obj, propertyName);
++}
++
++bool NPN_Enumerate(NPP npp, NPObject *obj, NPIdentifier **identifier,
++                   uint32_t *count)
++{
++#if defined(NPVERS_HAS_NPOBJECT_ENUM) && (NP_VERSION_MINOR >= NPVERS_HAS_NPOBJECT_ENUM)
++  if ((NPNFuncs.version & 0xFF) >= NPVERS_HAS_NPOBJECT_ENUM)
++    return NPNFuncs.enumerate(npp, obj, identifier, count);
++#endif
++  return false;
++}
++
++bool NPN_Construct(NPP npp, NPObject *obj, const NPVariant *args,
++                   uint32_t argCount, NPVariant *result)
++{
++#if defined(NPVERS_HAS_NPOBJECT_ENUM) && (NP_VERSION_MINOR >= NPVERS_HAS_NPOBJECT_ENUM)
++  if ((NPNFuncs.version & 0xFF) >= NPVERS_HAS_NPOBJECT_ENUM)
++    return NPNFuncs.construct(npp, obj, args, argCount, result);
++#endif
++  return false;
++}
++
++bool NPN_HasProperty(NPP npp, NPObject* obj, NPIdentifier propertyName)
++{
++  return NPNFuncs.hasproperty(npp, obj, propertyName);
++}
++
++bool NPN_HasMethod(NPP npp, NPObject* obj, NPIdentifier methodName)
++{
++  return NPNFuncs.hasmethod(npp, obj, methodName);
++}
++
++void NPN_ReleaseVariantValue(NPVariant *variant)
++{
++  NPNFuncs.releasevariantvalue(variant);
++}
++
++void NPN_SetException(NPObject* obj, const NPUTF8 *message)
++{
++  NPNFuncs.setexception(obj, message);
++}
++
++void* NPN_MemDup (const void* aMem, uint32_t aLen)
++{
++  if (!aMem || !aLen)
++    return NULL;
++
++  void* dup = NPN_MemAlloc (aLen);
++  if (!dup)
++    return NULL;
++
++  return memcpy (dup, aMem, aLen);
++}
++
++char* NPN_StrDup (const char* aString)
++{
++  return (char*) NPN_MemDup (aString, strlen (aString) + 1);
++}
+Index: totem-2.22.1/browser-plugin/totemPluginGlue.cpp
+===================================================================
+--- totem-2.22.1.orig/browser-plugin/totemPluginGlue.cpp	2010-06-24 21:44:49.260069068 +0100
++++ totem-2.22.1/browser-plugin/totemPluginGlue.cpp	2010-06-24 22:36:34.740081612 +0100
+@@ -28,8 +28,7 @@
+ #include <libgnomevfs/gnome-vfs-utils.h>
+ #include <dlfcn.h>
+ 
+-#include "npapi.h"
+-#include "npupp.h"
++#include "npfunctions.h"
+ 
+ #define GNOME_ENABLE_DEBUG 1
+ /* define GNOME_ENABLE_DEBUG for more debug spew */
+@@ -38,6 +37,8 @@
+ #include "totemPluginGlue.h"
+ #include "totemPlugin.h"
+ 
++NPNetscapeFuncs NPNFuncs;
++
+ static char *mime_list = NULL;
+ 
+ static NPError
+@@ -235,7 +236,7 @@
+ 		*((NPBool *)value) = TRUE;
+ 		break;
+ 	case NPPVpluginScriptableIID: {
+-		nsIID* ptr = static_cast<nsIID *>(totemPlugin::sNPN.memalloc (sizeof (nsIID)));
++		nsIID* ptr = static_cast<nsIID *>(NPN_MemAlloc (sizeof (nsIID)));
+ 		if (ptr) {
+ 			*ptr = NS_GET_IID (nsISupports);
+ 			*static_cast<nsIID **>(value) = ptr;
+@@ -410,21 +411,6 @@
+ 
+ 	D ("NP_Initialize");
+ 
+-	/* Do we support XEMBED? */
+-	err = CallNPN_GetValueProc (aMozillaFuncs->getvalue, NULL,
+-			NPNVSupportsXEmbedBool,
+-			(void *)&supportsXEmbed);
+-
+-	if (err != NPERR_NO_ERROR || supportsXEmbed != PR_TRUE)
+-		return NPERR_INCOMPATIBLE_VERSION_ERROR;
+-
+-	/* Are we using a GTK+ 2.x Moz? */
+-	err = CallNPN_GetValueProc (aMozillaFuncs->getvalue, NULL,
+-			NPNVToolkit, (void *)&toolkit);
+-
+-	if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2)
+-		return NPERR_INCOMPATIBLE_VERSION_ERROR;
+-
+ 	if(aMozillaFuncs == NULL || plugin_funcs == NULL)
+ 		return NPERR_INVALID_FUNCTABLE_ERROR;
+ 
+@@ -436,6 +422,21 @@
+ 	if (plugin_funcs->size < sizeof (NPPluginFuncs))
+ 		return NPERR_INVALID_FUNCTABLE_ERROR;
+ 
++        memcpy (&NPNFuncs, aMozillaFuncs, sizeof (NPNetscapeFuncs));
++        NPNFuncs.size = sizeof (NPNetscapeFuncs);
++
++	/* Do we support XEMBED? */
++	err = NPN_GetValue (NULL, NPNVSupportsXEmbedBool,
++			(void *)&supportsXEmbed);
++	if (err != NPERR_NO_ERROR || supportsXEmbed != PR_TRUE)
++		return NPERR_INCOMPATIBLE_VERSION_ERROR;
++
++	/* Are we using a GTK+ 2.x Moz? */
++	err = NPN_GetValue (NULL, NPNVToolkit,
++			(void *)&toolkit);
++	if (err != NPERR_NO_ERROR || toolkit != NPNVGtk2)
++		return NPERR_INCOMPATIBLE_VERSION_ERROR;
++
+ 	/* we want to open libdbus-glib-1.so.2 in such a way
+ 	 * in such a way that it becomes permanentely resident */
+ 	void *handle;
+@@ -447,38 +448,6 @@
+ 	/* RTLD_NODELETE allows us to close right away ... */
+ 	dlclose(handle);
+ 
+-
+-	/*
+-	 * Copy all of the fields of the Mozilla function table into our
+-	 * copy so we can call back into Mozilla later.  Note that we need
+-	 * to copy the fields one by one, rather than assigning the whole
+-	 * structure, because the Mozilla function table could actually be
+-	 * bigger than what we expect.
+-	 */
+-	totemPlugin::sNPN.size             = aMozillaFuncs->size;
+-	totemPlugin::sNPN.version          = aMozillaFuncs->version;
+-	totemPlugin::sNPN.geturl           = aMozillaFuncs->geturl;
+-	totemPlugin::sNPN.posturl          = aMozillaFuncs->posturl;
+-	totemPlugin::sNPN.requestread      = aMozillaFuncs->requestread;
+-	totemPlugin::sNPN.newstream        = aMozillaFuncs->newstream;
+-	totemPlugin::sNPN.write            = aMozillaFuncs->write;
+-	totemPlugin::sNPN.destroystream    = aMozillaFuncs->destroystream;
+-	totemPlugin::sNPN.status           = aMozillaFuncs->status;
+-	totemPlugin::sNPN.uagent           = aMozillaFuncs->uagent;
+-	totemPlugin::sNPN.memalloc         = aMozillaFuncs->memalloc;
+-	totemPlugin::sNPN.memfree          = aMozillaFuncs->memfree;
+-	totemPlugin::sNPN.memflush         = aMozillaFuncs->memflush;
+-	totemPlugin::sNPN.reloadplugins    = aMozillaFuncs->reloadplugins;
+-	totemPlugin::sNPN.getJavaEnv       = aMozillaFuncs->getJavaEnv;
+-	totemPlugin::sNPN.getJavaPeer      = aMozillaFuncs->getJavaPeer;
+-	totemPlugin::sNPN.geturlnotify     = aMozillaFuncs->geturlnotify;
+-	totemPlugin::sNPN.posturlnotify    = aMozillaFuncs->posturlnotify;
+-	totemPlugin::sNPN.getvalue         = aMozillaFuncs->getvalue;
+-	totemPlugin::sNPN.setvalue         = aMozillaFuncs->setvalue;
+-	totemPlugin::sNPN.invalidaterect   = aMozillaFuncs->invalidaterect;
+-	totemPlugin::sNPN.invalidateregion = aMozillaFuncs->invalidateregion;
+-	totemPlugin::sNPN.forceredraw      = aMozillaFuncs->forceredraw;
+-
+ 	/*
+ 	 * Set up a plugin function table that Mozilla will use to call
+ 	 * into us.  Mozilla needs to know about our version and size and
+@@ -487,29 +456,29 @@
+ 
+ 	plugin_funcs->size = sizeof(NPPluginFuncs);
+ 	plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
+-	plugin_funcs->newp = NewNPP_NewProc(totem_plugin_new_instance);
++	plugin_funcs->newp = NPP_NewProcPtr(totem_plugin_new_instance);
+ 	plugin_funcs->destroy =
+-		NewNPP_DestroyProc(totem_plugin_destroy_instance);
++		NPP_DestroyProcPtr(totem_plugin_destroy_instance);
+ 	plugin_funcs->setwindow =
+-		NewNPP_SetWindowProc(totem_plugin_set_window);
++		NPP_SetWindowProcPtr(totem_plugin_set_window);
+ 	plugin_funcs->newstream =
+-		NewNPP_NewStreamProc(totem_plugin_new_stream);
++		NPP_NewStreamProcPtr(totem_plugin_new_stream);
+ 	plugin_funcs->destroystream =
+-		NewNPP_DestroyStreamProc(totem_plugin_destroy_stream);
++		NPP_DestroyStreamProcPtr(totem_plugin_destroy_stream);
+ 	plugin_funcs->asfile =
+-		NewNPP_StreamAsFileProc(totem_plugin_stream_as_file);
++		NPP_StreamAsFileProcPtr(totem_plugin_stream_as_file);
+ 	plugin_funcs->writeready =
+-		NewNPP_WriteReadyProc(totem_plugin_write_ready);
+-	plugin_funcs->write = NewNPP_WriteProc(totem_plugin_write);
++		NPP_WriteReadyProcPtr(totem_plugin_write_ready);
++	plugin_funcs->write = NPP_WriteProcPtr(totem_plugin_write);
+ 	/* Printing ? */
+-	plugin_funcs->print = NewNPP_PrintProc(totem_plugin_print);
++	plugin_funcs->print = NPP_PrintProcPtr(totem_plugin_print);
+ 	/* What's that for ? */
+-	plugin_funcs->event = NewNPP_HandleEventProc(NULL);
++	plugin_funcs->event = NPP_HandleEventProcPtr(NULL);
+ 	plugin_funcs->urlnotify =
+-		NewNPP_URLNotifyProc(totem_plugin_url_notify);
++		NPP_URLNotifyProcPtr(totem_plugin_url_notify);
+ 	plugin_funcs->javaClass = NULL;
+-	plugin_funcs->getvalue = NewNPP_GetValueProc(totem_plugin_get_value);
+-	plugin_funcs->setvalue = NewNPP_SetValueProc(totem_plugin_set_value);
++	plugin_funcs->getvalue = NPP_GetValueProcPtr(totem_plugin_get_value);
++	plugin_funcs->setvalue = NPP_SetValueProcPtr(totem_plugin_set_value);
+ 
+ 	D ("NP_Initialize succeeded");
+ 
+Index: totem-2.22.1/browser-plugin/totemNPClass.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPClass.cpp	2010-06-24 22:36:34.740081612 +0100
+@@ -0,0 +1,207 @@
++/*
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#include <config.h>
++#include <string.h>
++
++#include "totemNPClass.h"
++#include "totemNPObject.h"
++
++totemNPClass_base::totemNPClass_base (const char *aPropertNames[],
++                                      uint32_t aPropertyCount,
++                                      const char *aMethodNames[],
++                                      uint32_t aMethodCount,
++                                      const char *aDefaultMethodName) :
++  mPropertyNameIdentifiers (GetIdentifiersForNames (aPropertNames, aPropertyCount)),
++  mMethodNameIdentifiers (GetIdentifiersForNames (aMethodNames, aMethodCount)),
++  mDefaultMethodIndex (aDefaultMethodName ? GetMethodIndex (NPN_GetStringIdentifier (aDefaultMethodName)) : -1)
++{
++  structVersion  = NP_CLASS_STRUCT_VERSION_ENUM;
++  allocate       = Allocate;
++  deallocate     = Deallocate;
++  invalidate     = Invalidate;
++  hasMethod      = HasMethod;
++  invoke         = Invoke;
++  invokeDefault  = InvokeDefault;
++  hasProperty    = HasProperty;
++  getProperty    = GetProperty;
++  setProperty    = SetProperty;
++  removeProperty = RemoveProperty;
++#if defined(NP_CLASS_STRUCT_VERSION_ENUM) && (NP_CLASS_STRUCT_VERSION >= NP_CLASS_STRUCT_VERSION_ENUM)
++  enumerate      = Enumerate;
++#endif
++#if defined(NP_CLASS_STRUCT_VERSION_CTOR) && (NP_CLASS_STRUCT_VERSION >= NP_CLASS_STRUCT_VERSION_CTOR)
++  /* FIXMEchpe find out what's this supposed to do */
++  /* construct      = Construct; */
++  construct = NULL;
++#endif
++}
++
++totemNPClass_base::~totemNPClass_base ()
++{
++  NPN_MemFree (mPropertyNameIdentifiers);
++  NPN_MemFree (mMethodNameIdentifiers);
++}
++
++NPIdentifier*
++totemNPClass_base::GetIdentifiersForNames (const char *aNames[],
++                                           uint32_t aCount)
++{
++  if (aCount == 0)
++    return NULL;
++
++  NPIdentifier *identifiers = reinterpret_cast<NPIdentifier*>(NPN_MemAlloc (aCount * sizeof (NPIdentifier)));
++  if (!identifiers)
++    return NULL;
++
++  NPN_GetStringIdentifiers (aNames, aCount, identifiers);
++
++  return identifiers;
++}
++
++int
++totemNPClass_base::GetPropertyIndex (NPIdentifier aName)
++{
++  if (!mPropertyNameIdentifiers)
++    return -1;
++
++  for (int i = 0; mPropertyNameIdentifiers[i]; ++i) {
++    if (aName == mPropertyNameIdentifiers[i])
++      return i;
++  }
++
++  return -1;
++}
++
++int
++totemNPClass_base::GetMethodIndex (NPIdentifier aName)
++{
++  if (!mMethodNameIdentifiers)
++    return -1;
++
++  for (int i = 0; mMethodNameIdentifiers[i]; ++i) {
++    if (aName == mMethodNameIdentifiers[i])
++      return i;
++  }
++
++  return -1;
++}
++
++bool
++totemNPClass_base::EnumerateProperties (NPIdentifier **_result, uint32_t *_count)
++{
++  if (!mPropertyNameIdentifiers)
++    return false;
++
++  uint32_t bytes = mPropertyNamesCount * sizeof (NPIdentifier);
++  NPIdentifier *identifiers = reinterpret_cast<NPIdentifier*>(NPN_MemAlloc (bytes));
++  if (!identifiers)
++    return false;
++
++  memcpy (identifiers, mPropertyNameIdentifiers, bytes);
++
++  *_result = identifiers;
++  *_count = mPropertyNamesCount;
++
++  return true;
++}
++
++NPObject*
++totemNPClass_base::Allocate (NPP aNPP, NPClass *aClass)
++{
++  totemNPClass_base* _class = static_cast<totemNPClass_base*>(aClass);
++  return _class->InternalCreate (aNPP);
++}
++
++void
++totemNPClass_base::Deallocate (NPObject *aObject)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  delete object;
++}
++
++void
++totemNPClass_base::Invalidate (NPObject *aObject)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  object->Invalidate ();
++}
++
++bool
++totemNPClass_base::HasMethod (NPObject *aObject, NPIdentifier aName)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->HasMethod (aName);
++}
++
++bool
++totemNPClass_base::Invoke (NPObject *aObject, NPIdentifier aName, const NPVariant *argv, uint32_t argc, NPVariant *_result)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->Invoke (aName, argv, argc, _result);
++}
++
++bool
++totemNPClass_base::InvokeDefault (NPObject *aObject, const NPVariant *argv, uint32_t argc, NPVariant *_result)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->InvokeDefault (argv, argc, _result);
++}
++
++bool
++totemNPClass_base::HasProperty (NPObject *aObject, NPIdentifier aName)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->HasProperty (aName);
++}
++
++bool
++totemNPClass_base::GetProperty (NPObject *aObject, NPIdentifier aName, NPVariant *_result)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->GetProperty (aName, _result);
++}
++
++bool
++totemNPClass_base::SetProperty (NPObject *aObject, NPIdentifier aName, const NPVariant *aValue)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->SetProperty (aName, aValue);
++}
++
++bool
++totemNPClass_base::RemoveProperty (NPObject *aObject, NPIdentifier aName)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->RemoveProperty (aName);
++}
++
++bool
++totemNPClass_base::Enumerate (NPObject *aObject, NPIdentifier **_result, uint32_t *_count)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->Enumerate (_result, _count);
++}
++
++bool
++totemNPClass_base::Construct (NPObject *aObject, const NPVariant *argv, uint32_t argc, NPVariant *_result)
++{
++  totemNPObject* object = static_cast<totemNPObject*> (aObject);
++  return object->Construct (argv, argc, _result);
++}
+Index: totem-2.22.1/browser-plugin/totemNPClass.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPClass.h	2010-06-24 22:36:34.740081612 +0100
+@@ -0,0 +1,156 @@
++/*
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __TOTEM_NPCLASS_H__
++#define __TOTEM_NPCLASS_H__
++
++#include <assert.h>
++
++#include "npapi.h"
++#include "npruntime.h"
++
++class totemNPObject;
++
++class totemNPClass_base : public NPClass {
++
++  public:
++
++    NPObject* CreateInstance (NPP aNPP) {
++      return NPN_CreateObject (aNPP, this);
++    }
++
++  protected:
++    friend class totemNPObject;
++
++    totemNPClass_base (const char *aPropertNames[],
++                       uint32_t aPropertyCount,
++                       const char *aMethodNames[],
++                       uint32_t aMethodCount,
++                       const char *aDefaultMethodName);
++    virtual ~totemNPClass_base ();
++
++    virtual NPObject* InternalCreate (NPP aNPP) = 0;
++
++    int GetPropertyIndex (NPIdentifier aName);
++    int GetMethodIndex   (NPIdentifier aName);
++    int GetDefaultMethodIndex () const { return mDefaultMethodIndex; }
++    bool EnumerateProperties (NPIdentifier **_result, uint32_t *_count);
++
++  private:
++
++    static NPObject* Allocate  (NPP aNPP, NPClass *aClass);
++    static void Deallocate     (NPObject *aObject);
++    static void Invalidate     (NPObject *aObject);
++    static bool HasMethod      (NPObject *aObject, NPIdentifier aName);
++    static bool Invoke         (NPObject *aObject, NPIdentifier aName, const NPVariant *argv, uint32_t argc, NPVariant *_result);
++    static bool InvokeDefault  (NPObject *aObject, const NPVariant *argv, uint32_t argc, NPVariant *_result);
++    static bool HasProperty    (NPObject *aObject, NPIdentifier aName);
++    static bool GetProperty    (NPObject *aObject, NPIdentifier aName, NPVariant *_result);
++    static bool SetProperty    (NPObject *aObject, NPIdentifier aName, const NPVariant *aValue);
++    static bool RemoveProperty (NPObject *aObject, NPIdentifier aName);
++    static bool Enumerate      (NPObject *aObject, NPIdentifier **_result, uint32_t *_count);
++    static bool Construct      (NPObject *aObject, const NPVariant *argv, uint32_t argc, NPVariant *_result);
++
++    NPIdentifier* GetIdentifiersForNames (const char *aNames[], uint32_t aCount);
++
++    NPIdentifier *mPropertyNameIdentifiers;
++    int mPropertyNamesCount;
++    NPIdentifier *mMethodNameIdentifiers;
++    int mMethodNamesCount;
++    int mDefaultMethodIndex;
++};
++
++template <class T>
++class totemNPClass : public totemNPClass_base {
++  
++  public:
++
++    typedef totemNPClass<T> class_type;
++
++    totemNPClass (const char *aPropertNames[],
++                  uint32_t aPropertyCount,
++                  const char *aMethodNames[],
++                  uint32_t aMethodCount,
++                  const char *aDefaultMethodName) :
++      totemNPClass_base (aPropertNames, aPropertyCount,
++                         aMethodNames, aMethodCount,
++                         aDefaultMethodName) {
++    }
++
++    virtual ~totemNPClass () { }
++
++  protected:
++
++    virtual NPObject* InternalCreate (NPP aNPP) {
++      return new T (aNPP);
++    }
++};
++
++/* Helper macros */
++
++#define TOTEM_DEFINE_NPCLASS(T) \
++class T##NPClass : public totemNPClass<T> {\
++\
++  public:\
++\
++    T##NPClass () throw ();\
++    virtual ~T##NPClass ();\
++\
++    static class_type* Instance () throw ();\
++    static void Shutdown ();\
++\
++  private:\
++    static class_type* sInstance;\
++}
++
++#define TOTEM_IMPLEMENT_NPCLASS(T, propertyNames, propertyNamesCount, methodNames, methodNamesCount, defaultMethodName) \
++\
++T##NPClass::class_type* T##NPClass::sInstance = 0; \
++\
++T##NPClass::T##NPClass () throw ()\
++  : totemNPClass<T> (propertyNames,\
++                     propertyNamesCount,\
++                     methodNames,\
++                     methodNamesCount,\
++                     defaultMethodName)\
++{\
++}\
++\
++T##NPClass::~T##NPClass ()\
++{\
++}\
++\
++T##NPClass::class_type* \
++T##NPClass::Instance () throw ()\
++{\
++  if (!sInstance) {\
++    sInstance = new T##NPClass ();\
++  }\
++\
++  return sInstance;\
++}\
++\
++void \
++T##NPClass::Shutdown ()\
++{\
++  delete sInstance;\
++  sInstance = 0;\
++}
++
++#endif /* __TOTEM_NPCLASS_H__ */
+Index: totem-2.22.1/browser-plugin/totemNPObject.cpp
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPObject.cpp	2010-06-24 22:36:34.740081612 +0100
+@@ -0,0 +1,605 @@
++/*
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#include <config.h>
++
++#include <string.h>
++#include <stdio.h>
++#include <stdarg.h>
++
++#include <glib.h>
++
++#include "totemNPClass.h"
++#include "totemNPObject.h"
++
++#ifdef DEBUG_PLUGIN
++#define NOTE(x) x
++#else
++#define NOTE(x)
++#endif
++
++static const char *variantTypes[] = {
++  "void",
++  "null",
++  "bool",
++  "int32",
++  "double",
++  "string",
++  "object",
++  "unknown"
++};
++
++#define VARIANT_TYPE(type) (variantTypes[MIN (type, NPVariantType_Object + 1)])
++
++static
++void* NPN_MemDup (const void* aMem, uint32_t aLen)
++{
++  if (!aMem || !aLen)
++    return NULL;
++
++  void* dup = NPN_MemAlloc (aLen);
++  if (!dup)
++    return NULL;
++
++  return memcpy (dup, aMem, aLen);
++}
++
++static
++char* NPN_StrDup (const char* aString)
++{
++  return (char*) NPN_MemDup (aString, strlen (aString) + 1);
++}
++
++void*
++totemNPObject::operator new (size_t aSize) throw ()
++{
++  void *instance = ::operator new (aSize);
++  if (instance) {
++    memset (instance, 0, aSize);
++  }
++
++  return instance;
++}
++
++totemNPObject::totemNPObject (NPP aNPP)
++  : mNPP (aNPP),
++    mPlugin (reinterpret_cast<totemPlugin*>(aNPP->pdata))
++{
++  NOTE (g_print ("totemNPObject ctor [%p]\n", (void*) this));
++}
++
++totemNPObject::~totemNPObject ()
++{
++  NOTE (g_print ("totemNPObject dtor [%p]\n", (void*) this));
++}
++
++bool
++totemNPObject::Throw (const char *aMessage)
++{
++  NOTE (g_print ("totemNPObject::Throw [%p] : %s\n", (void*) this, aMessage));
++
++  NPN_SetException (this, aMessage);
++  return false;
++}
++
++bool
++totemNPObject::ThrowPropertyNotWritable ()
++{
++  return Throw ("Property not writable");
++}
++
++bool
++totemNPObject::ThrowSecurityError ()
++{
++  return Throw ("Access denied");
++}
++
++bool
++totemNPObject::CheckArgc (uint32_t argc,
++                          uint32_t minArgc,
++                          uint32_t maxArgc,
++                          bool doThrow)
++{
++  if (argc >= minArgc && argc <= maxArgc)
++    return true;
++
++  if (argc < minArgc) {
++    if (doThrow)
++      return Throw ("Not enough arguments");
++
++    return false;
++  }
++
++  if (doThrow)
++    return Throw ("Too many arguments");
++
++  return false;
++}
++
++bool
++totemNPObject::CheckArgType (NPVariantType argType,
++                             NPVariantType expectedType,
++                             uint32_t argNum)
++{
++  bool conforms;
++
++  switch (argType) {
++    case NPVariantType_Void:
++    case NPVariantType_Null:
++      conforms = (argType == expectedType);
++      break;
++
++    case NPVariantType_Bool:
++      conforms = (argType == NPVariantType_Bool ||
++                  argType == NPVariantType_Int32 ||
++                  argType == NPVariantType_Double);
++      break;
++
++    case NPVariantType_Int32:
++    case NPVariantType_Double:
++      /* FIXMEchpe: also accept NULL or VOID ? */
++      conforms = (argType == NPVariantType_Int32 ||
++                  argType == NPVariantType_Double);
++      break;
++
++    case NPVariantType_String:
++    case NPVariantType_Object:
++      conforms = (argType == expectedType ||
++                  argType == NPVariantType_Null ||
++                  argType == NPVariantType_Void);
++      break;
++    default:
++      conforms = false;
++  }
++
++  if (!conforms) {
++      char msg[128];
++      g_snprintf (msg, sizeof (msg),
++                  "Wrong type of argument %d: expected %s but got %s\n",
++                  argNum, VARIANT_TYPE (expectedType), VARIANT_TYPE (argType));
++
++      return Throw (msg);
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::CheckArg (const NPVariant *argv,
++                         uint32_t argc,
++                         uint32_t argNum,
++                         NPVariantType type)
++{
++  if (!CheckArgc (argc, argNum + 1))
++    return false;
++
++  return CheckArgType (argv[argNum].type, type, argNum);
++}
++
++bool
++totemNPObject::CheckArgv (const NPVariant* argv,
++                          uint32_t argc,
++                          uint32_t expectedArgc,
++                          ...)
++{
++  if (!CheckArgc (argc, expectedArgc, expectedArgc))
++    return false;
++
++  va_list type_args;
++  va_start (type_args, expectedArgc);
++
++  for (uint32_t i = 0; i < argc; ++i) {
++    NPVariantType type = NPVariantType (va_arg (type_args, int /* promotion */));
++
++    if (!CheckArgType (argv[i].type, type)) {
++      va_end (type_args);
++      return false;
++    }
++  }
++
++  va_end (type_args);
++
++  return true;
++}
++
++bool
++totemNPObject::GetBoolFromArguments (const NPVariant* argv,
++                                     uint32_t argc,
++                                     uint32_t argNum,
++                                     bool& _result)
++{
++  if (!CheckArg (argv, argc, argNum, NPVariantType_Bool))
++    return false;
++
++  NPVariant arg = argv[argNum];
++  if (NPVARIANT_IS_BOOLEAN (arg)) {
++    _result = NPVARIANT_TO_BOOLEAN (arg);
++  } else if (NPVARIANT_IS_INT32 (arg)) {
++    _result = NPVARIANT_TO_INT32 (arg) != 0;
++  } else if (NPVARIANT_IS_DOUBLE (arg)) {
++    _result = NPVARIANT_TO_DOUBLE (arg) != 0.0;
++  } else {
++    /* void/null */
++    _result = false;
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::GetInt32FromArguments (const NPVariant* argv,
++                                      uint32_t argc,
++                                      uint32_t argNum,
++                                      int32_t& _result)
++{
++  if (!CheckArg (argv, argc, argNum, NPVariantType_Int32))
++    return false;
++
++  NPVariant arg = argv[argNum];
++  if (NPVARIANT_IS_INT32 (arg)) {
++    _result = NPVARIANT_TO_INT32 (arg);
++  } else if (NPVARIANT_IS_DOUBLE (arg)) {
++    _result = int32_t (NPVARIANT_TO_DOUBLE (arg));
++    /* FIXMEchpe: overflow? */
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::GetDoubleFromArguments (const NPVariant* argv,
++                                       uint32_t argc,
++                                       uint32_t argNum,
++                                       double& _result)
++{
++  if (!CheckArg (argv, argc, argNum, NPVariantType_Double))
++    return false;
++
++  NPVariant arg = argv[argNum];
++  if (NPVARIANT_IS_DOUBLE (arg)) {
++    _result = NPVARIANT_TO_DOUBLE (arg);
++  } else if (NPVARIANT_IS_INT32 (arg)) {
++    _result = double (NPVARIANT_TO_INT32 (arg));
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::GetStringFromArguments (const NPVariant* argv,
++                                       uint32_t argc,
++                                       uint32_t argNum,
++                                       const char*& _result)
++{
++  if (!CheckArg (argv, argc, argNum, NPVariantType_String))
++    return false;
++
++  NPVariant arg = argv[argNum];
++  if (NPVARIANT_IS_STRING (arg)) {
++    NPString string = NPVARIANT_TO_STRING (arg);
++    // FIXMEchpe this assumes it's 0-terminated, check that this holds!
++    _result = string.UTF8Characters;
++  } else if (NPVARIANT_IS_NULL (arg) ||
++             NPVARIANT_IS_VOID (arg)) {
++    _result = NULL;
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::DupStringFromArguments (const NPVariant* argv,
++                                       uint32_t argc,
++                                       uint32_t argNum,
++                                       char*& _result)
++{
++  NPN_MemFree (_result);
++  _result = NULL;
++
++  const char *newValue;
++  if (!GetStringFromArguments (argv, argc, argNum, newValue))
++    return false;
++
++  /* This assumes every NPString is 0-terminated. FIXMEchpe check that this holds! */
++  _result = NPN_StrDup (newValue);
++  return true;
++}
++
++bool
++totemNPObject::GetObjectFromArguments (const NPVariant* argv,
++                                        uint32_t argc,
++                                        uint32_t argNum,
++                                        NPObject*& _result)
++{
++  if (!CheckArg (argv, argc, argNum, NPVariantType_Object))
++    return false;
++
++  NPVariant arg = argv[argNum];
++  if (NPVARIANT_IS_STRING (arg)) {
++    _result = NPVARIANT_TO_OBJECT (arg);
++  } else if (NPVARIANT_IS_NULL (arg) ||
++             NPVARIANT_IS_VOID (arg)) {
++    _result = NULL;
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::VoidVariant (NPVariant* _result)
++{
++  VOID_TO_NPVARIANT (*_result);
++  return true;
++}
++
++bool
++totemNPObject::NullVariant (NPVariant* _result)
++{
++  NULL_TO_NPVARIANT (*_result);
++  return true;
++}
++
++bool
++totemNPObject::BoolVariant (NPVariant* _result,
++                            bool value)
++{
++  BOOLEAN_TO_NPVARIANT (value, *_result);
++  return true;
++}
++
++bool
++totemNPObject::Int32Variant (NPVariant* _result,
++                             int32_t value)
++{
++  INT32_TO_NPVARIANT (value, *_result);
++  return true;
++}
++
++bool
++totemNPObject::DoubleVariant (NPVariant* _result,
++                              double value)
++{
++  DOUBLE_TO_NPVARIANT (value, *_result);
++  return true;
++}
++
++bool
++totemNPObject::StringVariant (NPVariant* _result,
++                              const char* value,
++                              int32_t len)
++{
++  if (!value) {
++    NULL_TO_NPVARIANT (*_result);
++  } else {
++    char *dup;
++
++    if (len < 0) {
++      len = strlen (value);
++      dup = (char*) NPN_MemDup (value, len + 1);
++    } else {
++      dup = (char*) NPN_MemDup (value, len);
++    }
++
++    if (dup) {
++      STRINGN_TO_NPVARIANT (dup, len, *_result);
++    } else {
++      NULL_TO_NPVARIANT (*_result);
++    }
++  }
++
++  return true;
++}
++
++bool
++totemNPObject::ObjectVariant (NPVariant* _result,
++                              NPObject* object)
++{
++  if (object) {
++    NPN_RetainObject (object);
++    OBJECT_TO_NPVARIANT (object, *_result);
++  } else {
++    NULL_TO_NPVARIANT (*_result);
++  }
++
++  return true;
++}
++
++/* NPObject method default implementations */
++
++void
++totemNPObject::Invalidate ()
++{
++  NOTE (g_print ("totemNPObject %p invalidated\n", (void*) this));
++
++  mNPP = NULL;
++  mPlugin = NULL;
++}
++
++bool
++totemNPObject::HasMethod (NPIdentifier aName)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::HasMethod [%p] %s\n", (void*) this, NPN_UTF8FromIdentifier (aName)));
++  if (GetClass()->GetMethodIndex (aName) >= 0)
++    return true;
++
++  if (aName == NPN_GetStringIdentifier ("__noSuchMethod__"))
++    return true;
++
++  return false;
++}
++
++bool
++totemNPObject::Invoke (NPIdentifier aName,
++                       const NPVariant *argv,
++                       uint32_t argc,
++                       NPVariant *_result)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::Invoke [%p] %s\n", (void*) this, NPN_UTF8FromIdentifier (aName)));
++  int methodIndex = GetClass()->GetMethodIndex (aName);
++  if (methodIndex >= 0)
++    return InvokeByIndex (methodIndex, argv, argc, _result);
++
++  if (aName == NPN_GetStringIdentifier ("__noSuchMethod__")) {
++    /* http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Reference:Global_Objects:Object:_noSuchMethod */
++    if (!CheckArgv (argv, argc, 2, NPVariantType_String, NPVariantType_Object))
++      return false;
++
++    const char *id = NPVARIANT_TO_STRING (argv[0]).UTF8Characters;
++    g_message ("NOTE: site calls unknown function \"%s\" on totemNPObject %p\n", id ? id : "(null)", (void*) this);
++
++    /* Silently ignore the invocation */
++    VOID_TO_NPVARIANT (*_result);
++    return true;
++  }
++
++  return Throw ("No method with this name exists.");
++}
++
++bool
++totemNPObject::InvokeDefault (const NPVariant *argv,
++                              uint32_t argc,
++                              NPVariant *_result)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::InvokeDefault [%p]\n", (void*) this));
++  int defaultMethodIndex = GetClass()->GetDefaultMethodIndex ();
++  if (defaultMethodIndex >= 0)
++    return InvokeByIndex (defaultMethodIndex, argv, argc, _result);
++
++  return false;
++}
++
++bool
++totemNPObject::HasProperty (NPIdentifier aName)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::HasProperty [%p] %s\n", (void*) this, NPN_UTF8FromIdentifier (aName)));
++  if (GetClass()->GetPropertyIndex (aName) >= 0)
++    return true;
++
++  return false;
++}
++
++bool
++totemNPObject::GetProperty (NPIdentifier aName,
++                            NPVariant *_result)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::GetProperty [%p] %s\n", (void*) this, NPN_UTF8FromIdentifier (aName)));
++  int propertyIndex = GetClass()->GetPropertyIndex (aName);
++  if (propertyIndex >= 0)
++    return GetPropertyByIndex (propertyIndex, _result);
++
++  return Throw ("No property with this name exists.");
++}
++
++bool
++totemNPObject::SetProperty (NPIdentifier aName,
++                            const NPVariant *aValue)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::SetProperty [%p] %s\n", (void*) this, NPN_UTF8FromIdentifier (aName)));
++  int propertyIndex = GetClass()->GetPropertyIndex (aName);
++  if (propertyIndex >= 0)
++    return SetPropertyByIndex (propertyIndex, aValue);
++
++  return Throw ("No property with this name exists.");
++}
++
++bool
++totemNPObject::RemoveProperty (NPIdentifier aName)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::RemoveProperty [%p] %s\n", (void*) this, NPN_UTF8FromIdentifier (aName)));
++  int propertyIndex = GetClass()->GetPropertyIndex (aName);
++  if (propertyIndex >= 0)
++    return RemovePropertyByIndex (propertyIndex);
++
++  return Throw ("No property with this name exists.");
++}
++
++bool
++totemNPObject::Enumerate (NPIdentifier **_result,
++                          uint32_t *_count)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::Enumerate [%p]\n", (void*) this));
++  return GetClass()->EnumerateProperties (_result, _count);
++}
++
++bool
++totemNPObject::Construct (const NPVariant *argv,
++                          uint32_t argc,
++                          NPVariant *_result)
++{
++  if (!IsValid ())
++    return false;
++
++  NOTE (g_print ("totemNPObject::Construct [%p]\n", (void*) this));
++  return false; /* FIXMEchpe! */
++}
++
++/* by-index methods */
++
++bool
++totemNPObject::InvokeByIndex (int aIndex,
++                              const NPVariant *argv,
++                              uint32_t argc,
++                              NPVariant *_result)
++{
++  return false;
++}
++
++bool
++totemNPObject::GetPropertyByIndex (int aIndex,
++                                   NPVariant *_result)
++{
++  return false;
++}
++
++bool
++totemNPObject::SetPropertyByIndex (int aIndex,
++                                   const NPVariant *aValue)
++{
++  return false;
++}
++
++bool
++totemNPObject::RemovePropertyByIndex (int aIndex)
++{
++  return Throw ("Removing properties is not supported.");
++}
+Index: totem-2.22.1/browser-plugin/totemNPObject.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ totem-2.22.1/browser-plugin/totemNPObject.h	2010-06-24 22:36:34.740081612 +0100
+@@ -0,0 +1,204 @@
++/*
++ * Copyright © 2008 Christian Persch
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Library General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library 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
++ * Library General Public License for more details.
++ *
++ * You should have received a copy of the GNU Library General Public
++ * License along with this library; if not, write to the
++ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
++ * Boston, MA 02111-1307, USA.
++ */
++
++#ifndef __TOTEM_NPOBJECT_H__
++#define __TOTEM_NPOBJECT_H__
++
++#include <assert.h>
++
++#include "npapi.h"
++#include "npruntime.h"
++
++//FIXME force debug on
++#define GNOME_ENABLE_DEBUG 1
++
++#include "debug.h"
++
++class totemPlugin;
++class totemNPObject;
++class totemNPClass_base;
++template<class T> class totemNPClass;
++
++class totemNPObject : public NPObject {
++  public:
++    totemNPObject (NPP);
++
++    virtual ~totemNPObject ();
++
++    void* operator new (size_t aSize) throw ();
++
++  protected:
++    friend class totemNPClass_base;
++
++    /* NPObject methods */
++    virtual void Invalidate     ();
++    virtual bool HasMethod      (NPIdentifier aName);
++    virtual bool Invoke         (NPIdentifier aName, const NPVariant *argv, uint32_t argc, NPVariant *_result);
++    virtual bool InvokeDefault  (const NPVariant *argv, uint32_t argc, NPVariant *_result);
++    virtual bool HasProperty    (NPIdentifier aName);
++    virtual bool GetProperty    (NPIdentifier aName, NPVariant *_result);
++    virtual bool SetProperty    (NPIdentifier aName, const NPVariant *aValue);
++    virtual bool RemoveProperty (NPIdentifier aName);
++    virtual bool Enumerate      (NPIdentifier **_result, uint32_t *_count);
++    virtual bool Construct      (const NPVariant *argv, uint32_t argc, NPVariant *_result);
++
++    /* By Index methods */
++    virtual bool InvokeByIndex         (int aIndex, const NPVariant *argv, uint32_t argc, NPVariant *_result);
++    virtual bool GetPropertyByIndex    (int aIndex, NPVariant *_result);
++    virtual bool SetPropertyByIndex    (int aIndex, const NPVariant *aValue);
++    virtual bool RemovePropertyByIndex (int aIndex);
++
++  private:
++
++    NPP mNPP;
++    totemPlugin *mPlugin;
++
++  protected:
++
++    bool IsValid () const { return mPlugin != 0; }
++    totemPlugin* Plugin () const { assert (IsValid ()); return mPlugin; }
++
++    bool Throw (const char*);
++    bool ThrowPropertyNotWritable ();
++    bool ThrowSecurityError ();
++
++    bool CheckArgc (uint32_t, uint32_t, uint32_t = uint32_t(-1), bool = true);
++    bool CheckArgType (NPVariantType, NPVariantType, uint32_t = 0);
++    bool CheckArg (const NPVariant*, uint32_t, uint32_t, NPVariantType);
++    bool CheckArgv (const NPVariant*, uint32_t, uint32_t, ...);
++
++    bool GetBoolFromArguments (const NPVariant*, uint32_t, uint32_t, bool&);
++    bool GetInt32FromArguments (const NPVariant*, uint32_t, uint32_t, int32_t&);
++    bool GetDoubleFromArguments (const NPVariant*, uint32_t, uint32_t, double&);
++    bool GetStringFromArguments (const NPVariant*, uint32_t, uint32_t, const char*&);
++    bool DupStringFromArguments (const NPVariant*, uint32_t, uint32_t, char*&);
++    bool GetObjectFromArguments (const NPVariant*, uint32_t, uint32_t, NPObject*&);
++
++    bool VoidVariant (NPVariant*);
++    bool NullVariant (NPVariant*);
++    bool BoolVariant (NPVariant*, bool);
++    bool Int32Variant (NPVariant*, int32_t);
++    bool DoubleVariant (NPVariant*, double);
++    bool StringVariant (NPVariant*, const char*, int32_t = -1);
++    bool ObjectVariant (NPVariant*, NPObject*);
++
++  private:
++
++    totemNPClass_base* GetClass() const { return static_cast<totemNPClass_base*>(_class); }
++};
++
++/* Helper macros */
++
++#ifdef GNOME_ENABLE_DEBUG
++
++#define TOTEM_LOG_CTOR() D ("%s [%p]", __func__, (void*) this)
++#define TOTEM_LOG_DTOR() D ("%s [%p]", __func__, (void*) this)
++
++#define TOTEM_LOG_INVOKE(i, T) \
++{\
++  static bool logAccess[G_N_ELEMENTS (methodNames)];\
++  if (!logAccess[i]) {\
++    D ("NOTE: site calls function %s::%s", #T, methodNames[i]);\
++    logAccess[i] = true;\
++  }\
++}
++
++#define TOTEM_LOG_GETTER(i, T) \
++{\
++  static bool logAccess[G_N_ELEMENTS (propertyNames)];\
++  if (!logAccess[i]) {\
++    D ("NOTE: site gets property %s::%s", #T, propertyNames[i]);\
++    logAccess[i] = true;\
++  }\
++}
++
++#define TOTEM_LOG_SETTER(i, T) \
++{\
++  static bool logAccess[G_N_ELEMENTS (propertyNames)];\
++  if (!logAccess[i]) {\
++    D ("NOTE: site sets property %s::%s", #T, propertyNames[i]);\
++    logAccess[i] = true;\
++  }\
++}
++
++#else
++
++#define TOTEM_LOG_CTOR()
++#define TOTEM_LOG_DTOR()
++#define TOTEM_LOG_INVOKE(i, T)
++#define TOTEM_LOG_GETTER(i, T)
++#define TOTEM_LOG_SETTER(i, T)
++
++#endif /* GNOME_ENABLE_DEBUG */
++
++#define TOTEM_WARN_INVOKE_UNIMPLEMENTED(i, T) \
++{\
++  static bool logWarning[G_N_ELEMENTS (methodNames)];\
++  if (!logWarning[i]) {\
++    D ("WARNING: function %s::%s is unimplemented", #T, methodNames[i]);\
++    logWarning[i] = true;\
++  }\
++}
++
++#define TOTEM_WARN_1_INVOKE_UNIMPLEMENTED(i, T) \
++{\
++  static bool logWarning;\
++  if (!logWarning) {\
++    D ("WARNING: function %s::%s is unimplemented", #T, methodNames[i]);\
++    logWarning = true;\
++  }\
++}
++
++#define TOTEM_WARN_GETTER_UNIMPLEMENTED(i, T) \
++{\
++  static bool logWarning[G_N_ELEMENTS (propertyNames)];\
++  if (!logWarning[i]) {\
++    D ("WARNING: getter for property %s::%s is unimplemented", #T, propertyNames[i]);\
++    logWarning[i] = true;\
++  }\
++}
++
++#define TOTEM_WARN_1_GETTER_UNIMPLEMENTED(i, T) \
++{\
++  static bool logWarning;\
++  if (!logWarning) {\
++    D ("WARNING: getter for property %s::%s is unimplemented", #T, propertyNames[i]);\
++    logWarning = true;\
++  }\
++}
++
++#define TOTEM_WARN_SETTER_UNIMPLEMENTED(i, T) \
++{\
++  static bool logWarning[G_N_ELEMENTS (propertyNames)];\
++  if (!logWarning[i]) {\
++    D ("WARNING: setter for property %s::%s is unimplemented", #T, propertyNames[i]);\
++    logWarning[i] = true;\
++  }\
++}
++
++#define TOTEM_WARN_1_SETTER_UNIMPLEMENTED(i, T) \
++{\
++  static bool logWarning;\
++  if (!logWarning) {\
++    D ("WARNING: setter for property %s::%s is unimplemented", #T, propertyNames[i]);\
++    logWarning = true;\
++  }\
++}
++
++#endif /* __TOTEM_NPOBJECT_H__ */
+Index: totem-2.22.1/browser-plugin/totem-plugin-viewer.c
+===================================================================
+--- totem-2.22.1.orig/browser-plugin/totem-plugin-viewer.c	2010-06-24 21:44:49.240092577 +0100
++++ totem-2.22.1/browser-plugin/totem-plugin-viewer.c	2010-06-24 22:38:12.980068116 +0100
+@@ -32,6 +32,7 @@
+ #include <gdk/gdkx.h>
+ #include <gtk/gtk.h>
+ #include <gconf/gconf-client.h>
++#include <gio/gio.h>
+ 
+ #define SN_API_NOT_YET_FROZEN
+ #include <libsn/sn.h>
+@@ -939,6 +940,88 @@
+ 	return (result == GNOME_VFS_OK);
+ }
+ 
++static char *
++relative_uri_remove_query (const char *uri, char **query)
++{
++	char *qmark;
++
++	/* Look for '?' */
++	qmark = strrchr (uri, '?');
++	if (qmark == NULL)
++		return NULL;
++
++	*query = g_strdup (qmark);
++	return g_strndup (uri, qmark - uri);
++}
++
++static char *
++resolve_uri (const char *base_uri,
++	     const char *relative_uri)
++{
++	char *uri, *scheme, *query, *new_relative_uri;
++	GFile *base_gfile, *base_parent_gfile, *resolved_gfile;
++
++	if (!relative_uri)
++		return g_strdup (base_uri);
++
++	if (!base_uri)
++		return g_strdup (relative_uri);
++
++	/* If |relative_uri| has a scheme, it's a full URI, just return it */
++	scheme = g_uri_parse_scheme (relative_uri);
++	if (scheme) {
++		g_free (scheme);
++		return g_strdup (relative_uri);
++	}
++
++	base_gfile = g_file_new_for_uri (base_uri);
++	base_parent_gfile = g_file_get_parent (base_gfile);
++	if (!base_parent_gfile) {
++		g_print ("Base URI %s has no parent!\n", base_uri);
++		g_object_unref (base_gfile);
++		return NULL;
++	}
++	g_object_unref (base_gfile);
++
++	query = NULL;
++	new_relative_uri = relative_uri_remove_query (relative_uri, &query);
++
++	if (new_relative_uri) {
++		char *tmpuri;
++
++		resolved_gfile = g_file_resolve_relative_path (base_parent_gfile, new_relative_uri);
++		g_object_unref (base_parent_gfile);
++		if (!resolved_gfile) {
++			g_warning ("Failed to resolve relative URI '%s' against base '%s'\n", relative_uri, base_uri);
++			g_free (new_relative_uri);
++			g_free (query);
++			return NULL;
++		}
++
++		tmpuri = g_file_get_uri (resolved_gfile);
++		g_object_unref (resolved_gfile);
++		uri = g_strdup_printf ("%s%s", tmpuri, query);
++
++		g_free (tmpuri);
++		g_free (new_relative_uri);
++		g_free (query);
++
++		return uri;
++	} else {
++		resolved_gfile = g_file_resolve_relative_path (base_parent_gfile, relative_uri);
++		g_object_unref (base_parent_gfile);
++		if (!resolved_gfile) {
++			g_warning ("Failed to resolve relative URI '%s' against base '%s'\n", relative_uri, base_uri);
++			return NULL;
++		}
++
++		uri = g_file_get_uri (resolved_gfile);
++		g_object_unref (resolved_gfile);
++
++		return uri;
++	}
++}
++
+ static void
+ totem_embedded_set_uri (TotemEmbedded *emb,
+ 		        const char *uri,
+@@ -951,7 +1034,7 @@
+ 	old_base = emb->base_uri;
+ 	old_href = emb->href_uri;
+ 
+-	emb->current_uri = g_strdup (uri);
++	emb->current_uri = resolve_uri (base_uri, uri);
+ 	emb->base_uri = g_strdup (base_uri);
+ 	emb->is_browser_stream = (is_browser_stream != FALSE);
+ 	emb->href_uri = NULL;
--- totem-2.22.1.orig/debian/patches/90_from_svn_fix_youtube_requirement.patch
+++ totem-2.22.1/debian/patches/90_from_svn_fix_youtube_requirement.patch
@@ -0,0 +1,21 @@
+--- totem-2.22.1/src/plugins/youtube/youtube.py	2008/04/10 17:48:50	5355
++++ totem-2.22.1/src/plugins/youtube/youtube.py	2008/04/10 17:51:45	5356
+@@ -42,7 +42,7 @@
+ 		self.vadjust = {}
+ 		self.liststore = {}
+ 	def activate (self, totem_object):
+-		"""Check for the availability of the flvdemux and souphttpsrc GStreamer plugins"""
++		"""Check for the availability of the flvdemux and soup GStreamer plugins"""
+ 		bvw_name = totem_object.get_video_widget_backend_name ()
+ 
+ 		if bvw_name.find ("GStreamer") != -1:
+@@ -52,7 +52,7 @@
+ 				import gst
+ 
+ 				registry = gst.registry_get_default ()
+-				if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("souphttpsrc") == None:
++				if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("soup") == None:
+ 					"""This means an error will be displayed when they try to play anything"""
+ 					self.gstreamer_plugins_present = False
+ 			except ImportError:
+
--- totem-2.22.1.orig/debian/patches/02_lpi.patch
+++ totem-2.22.1/debian/patches/02_lpi.patch
@@ -0,0 +1,53 @@
+# Description: launchpad integration changes
+# UbuntuSpecific: ubuntu launchpad integration
+#
+Index: totem-2.22.1/configure.in
+===================================================================
+--- totem-2.22.1.orig/configure.in	2008-04-08 15:02:03.000000000 +0200
++++ totem-2.22.1/configure.in	2008-04-08 23:03:21.000000000 +0200
+@@ -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
+Index: totem-2.22.1/data/totem.ui
+===================================================================
+--- totem-2.22.1.orig/data/totem.ui	2008-03-04 18:20:05.000000000 +0100
++++ totem-2.22.1/data/totem.ui	2008-04-08 23:03:30.000000000 +0200
+@@ -498,6 +498,7 @@
+          </menu>
+          <menu name="help" action="help-menu">
+             <menuitem name="contents" action="contents"/>
++            <placeholder name='LaunchpadItems'/>
+             <menuitem name="about" action="about"/>
+          </menu>
+       </menubar>
+Index: totem-2.22.1/src/totem-menu.c
+===================================================================
+--- totem-2.22.1.orig/src/totem-menu.c	2008-03-04 18:20:03.000000000 +0100
++++ totem-2.22.1/src/totem-menu.c	2008-04-08 23:03:21.000000000 +0200
+@@ -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"
+@@ -1403,5 +1405,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.22.1.orig/debian/bug/control
+++ totem-2.22.1/debian/bug/control
@@ -0,0 +1 @@
+report-with: totem-gstreamer totem-xine
