r14070 - in /desktop/unstable/totem/debian: changelog patches/70_autoconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Jan 7 20:55:44 UTC 2008
Author: slomo
Date: Mon Jan 7 20:55:44 2008
New Revision: 14070
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14070
Log:
* New upstream bugfix release:
+ debian/patches/70_autoconf.patch:
- Regenerated for the new version.
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/patches/70_autoconf.patch
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=14070&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog (original)
+++ desktop/unstable/totem/debian/changelog Mon Jan 7 20:55:44 2008
@@ -1,4 +1,4 @@
-totem (2.20.1-2) UNRELEASED; urgency=low
+totem (2.20.3-1) unstable; urgency=low
[ Loic Minier ]
* Let totem-common and totem-plugins replace totem-xine and -gstreamer.
@@ -10,7 +10,12 @@
[ Sebastien Bacher ]
* use change from launchpad bug #177459 to fix bashim in the debian rules
- -- Loic Minier <lool at dooz.org> Mon, 26 Nov 2007 17:45:34 +0100
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/70_autoconf.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 07 Jan 2008 21:49:41 +0100
totem (2.20.1-1) unstable; urgency=low
Modified: desktop/unstable/totem/debian/patches/70_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/70_autoconf.patch?rev=14070&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/70_autoconf.patch (original)
+++ desktop/unstable/totem/debian/patches/70_autoconf.patch Mon Jan 7 20:55:44 2008
@@ -1,16 +1,37 @@
-diff -x'*config.sub*' -x'*config.guess*' -Naur totem-2.20.1.old/aclocal.m4 totem-2.20.1/aclocal.m4
---- totem-2.20.1.old/aclocal.m4 2007-10-17 15:13:08.000000000 +0200
-+++ totem-2.20.1/aclocal.m4 2007-10-25 15:09:06.000000000 +0200
-@@ -929,7 +929,7 @@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/aclocal.m4 totem-2.20.3/aclocal.m4
+--- totem-2.20.3.old/aclocal.m4 2008-01-07 17:30:44.000000000 +0100
++++ totem-2.20.3/aclocal.m4 2008-01-07 21:53:44.000000000 +0100
+@@ -795,6 +795,20 @@
+ AC_SUBST(INTLTOOL_SERVICE_RULE)
+ AC_SUBST(INTLTOOL_POLICY_RULE)
+
++# Check the gettext tools to make sure they are GNU
++AC_PATH_PROG(XGETTEXT, xgettext)
++AC_PATH_PROG(MSGMERGE, msgmerge)
++AC_PATH_PROG(MSGFMT, msgfmt)
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
++fi
++
+ # Use the tools built into the package, not the ones that are installed.
+ AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+ AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+@@ -929,7 +943,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 51 AC_PROG_LIBTOOL
-+# serial 51 Debian 1.5.24-1ubuntu1 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1481,7 +1481,6 @@
+@@ -1481,7 +1495,6 @@
esac
;;
*64-bit*)
@@ -18,7 +39,7 @@
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -2540,13 +2539,11 @@
+@@ -2540,13 +2553,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -33,7 +54,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -2558,6 +2555,18 @@
+@@ -2558,6 +2569,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -52,7 +73,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -3332,7 +3341,7 @@
+@@ -3332,7 +3355,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -61,7 +82,7 @@
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
-@@ -4366,7 +4375,7 @@
+@@ -4366,7 +4389,7 @@
;;
esac
;;
@@ -70,7 +91,7 @@
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=
-@@ -6047,7 +6056,7 @@
+@@ -6047,7 +6070,7 @@
;;
esac
;;
@@ -79,7 +100,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -6422,6 +6431,9 @@
+@@ -6422,6 +6445,9 @@
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'
;;
@@ -89,7 +110,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -6627,12 +6639,13 @@
+@@ -6627,12 +6653,13 @@
$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
@@ -104,7 +125,7 @@
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=
-@@ -7064,7 +7077,7 @@
+@@ -7064,7 +7091,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -113,10 +134,215 @@
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 -x'*config.sub*' -x'*config.guess*' -Naur totem-2.20.1.old/configure totem-2.20.1/configure
---- totem-2.20.1.old/configure 2007-10-17 15:13:14.000000000 +0200
-+++ totem-2.20.1/configure 2007-10-25 15:09:15.000000000 +0200
-@@ -7633,7 +7633,7 @@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/bindings/Makefile.in totem-2.20.3/bindings/Makefile.in
+--- totem-2.20.3.old/bindings/Makefile.in 2008-01-07 17:30:48.000000000 +0100
++++ totem-2.20.3/bindings/Makefile.in 2008-01-07 21:53:52.000000000 +0100
+@@ -182,6 +182,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/bindings/python/Makefile.in totem-2.20.3/bindings/python/Makefile.in
+--- totem-2.20.3.old/bindings/python/Makefile.in 2008-01-07 17:30:48.000000000 +0100
++++ totem-2.20.3/bindings/python/Makefile.in 2008-01-07 21:53:52.000000000 +0100
+@@ -195,6 +195,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/bindings/vala/Makefile.in totem-2.20.3/bindings/vala/Makefile.in
+--- totem-2.20.3.old/bindings/vala/Makefile.in 2008-01-07 17:30:48.000000000 +0100
++++ totem-2.20.3/bindings/vala/Makefile.in 2008-01-07 21:53:53.000000000 +0100
+@@ -171,6 +171,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/browser-plugin/idl/Makefile.in totem-2.20.3/browser-plugin/idl/Makefile.in
+--- totem-2.20.3.old/browser-plugin/idl/Makefile.in 2008-01-07 17:30:49.000000000 +0100
++++ totem-2.20.3/browser-plugin/idl/Makefile.in 2008-01-07 21:53:53.000000000 +0100
+@@ -189,6 +189,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/browser-plugin/Makefile.in totem-2.20.3/browser-plugin/Makefile.in
+--- totem-2.20.3.old/browser-plugin/Makefile.in 2008-01-07 17:30:49.000000000 +0100
++++ totem-2.20.3/browser-plugin/Makefile.in 2008-01-07 21:53:53.000000000 +0100
+@@ -383,6 +383,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/configure totem-2.20.3/configure
+--- totem-2.20.3.old/configure 2008-01-07 17:30:56.000000000 +0100
++++ totem-2.20.3/configure 2008-01-07 21:53:49.000000000 +0100
+@@ -891,6 +891,7 @@
+ INTLTOOL_THEME_RULE
+ INTLTOOL_SERVICE_RULE
+ INTLTOOL_POLICY_RULE
++MSGMERGE
+ INTLTOOL_EXTRACT
+ INTLTOOL_MERGE
+ INTLTOOL_UPDATE
+@@ -6165,6 +6166,141 @@
+
+
+
++# Check the gettext tools to make sure they are GNU
++# Extract the first word of "xgettext", so it can be a program name with args.
++set dummy xgettext; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $XGETTEXT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
++ ;;
++ *)
++ 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_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MSGMERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
++ ;;
++ *)
++ 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_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
++ ;;
++ *)
++ 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_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
+ # Use the tools built into the package, not the ones that are installed.
+ INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+
+@@ -7633,7 +7769,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -125,7 +351,16 @@
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
-@@ -7818,7 +7818,6 @@
+@@ -7753,7 +7889,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7756 "configure"' > conftest.$ac_ext
++ echo '#line 7892 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7818,7 +7954,6 @@
esac
;;
*64-bit*)
@@ -133,49 +368,49 @@
case $host in
x86_64-*kfreebsd*-gnu)
LD="${LD-ld} -m elf_x86_64_fbsd"
-@@ -9550,11 +9549,11 @@
+@@ -9550,11 +9685,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9553: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9552: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9688: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9557: \$? = $ac_status" >&5
-+ echo "$as_me:9556: \$? = $ac_status" >&5
++ echo "$as_me:9692: \$? = $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.
-@@ -9840,11 +9839,11 @@
+@@ -9840,11 +9975,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9843: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9842: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9978: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9847: \$? = $ac_status" >&5
-+ echo "$as_me:9846: \$? = $ac_status" >&5
++ echo "$as_me:9982: \$? = $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.
-@@ -9944,11 +9943,11 @@
+@@ -9944,11 +10079,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9947: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9946: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10082: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9951: \$? = $ac_status" >&5
-+ echo "$as_me:9950: \$? = $ac_status" >&5
++ echo "$as_me:10086: \$? = $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
-@@ -10208,12 +10207,13 @@
+@@ -10208,12 +10343,13 @@
$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
@@ -190,7 +425,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10757,7 +10757,7 @@
+@@ -10757,7 +10893,7 @@
link_all_deplibs=yes
;;
@@ -199,7 +434,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11452,13 +11452,11 @@
+@@ -11452,13 +11588,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -214,7 +449,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11470,6 +11468,18 @@
+@@ -11470,6 +11604,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -233,25 +468,25 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12295,7 +12305,7 @@
+@@ -12295,7 +12441,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12298 "configure"
-+#line 12308 "configure"
++#line 12444 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12395,7 +12405,7 @@
+@@ -12395,7 +12541,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12398 "configure"
-+#line 12408 "configure"
++#line 12544 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14005,7 +14015,7 @@
+@@ -14005,7 +14151,7 @@
;;
esac
;;
@@ -260,7 +495,7 @@
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=
-@@ -14706,7 +14716,7 @@
+@@ -14706,7 +14852,7 @@
;;
esac
;;
@@ -269,35 +504,35 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -14815,11 +14825,11 @@
+@@ -14815,11 +14961,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14818: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14828: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14964: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14822: \$? = $ac_status" >&5
-+ echo "$as_me:14832: \$? = $ac_status" >&5
++ echo "$as_me:14968: \$? = $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.
-@@ -14919,11 +14929,11 @@
+@@ -14919,11 +15065,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14922: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14932: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15068: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14926: \$? = $ac_status" >&5
-+ echo "$as_me:14936: \$? = $ac_status" >&5
++ echo "$as_me:15072: \$? = $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
-@@ -14991,6 +15001,9 @@
+@@ -14991,6 +15137,9 @@
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'
;;
@@ -307,7 +542,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -15420,13 +15433,11 @@
+@@ -15420,13 +15569,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -322,7 +557,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15438,6 +15449,18 @@
+@@ -15438,6 +15585,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -341,35 +576,35 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -16483,11 +16506,11 @@
+@@ -16483,11 +16642,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16486: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16509: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16490: \$? = $ac_status" >&5
-+ echo "$as_me:16513: \$? = $ac_status" >&5
++ echo "$as_me:16649: \$? = $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.
-@@ -16587,11 +16610,11 @@
+@@ -16587,11 +16746,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16590: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:16613: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16749: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16594: \$? = $ac_status" >&5
-+ echo "$as_me:16617: \$? = $ac_status" >&5
++ echo "$as_me:16753: \$? = $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
-@@ -16851,12 +16874,13 @@
+@@ -16851,12 +17010,13 @@
$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
@@ -384,7 +619,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -17380,7 +17404,7 @@
+@@ -17380,7 +17540,7 @@
link_all_deplibs_F77=yes
;;
@@ -393,7 +628,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -18023,13 +18047,11 @@
+@@ -18023,13 +18183,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -408,7 +643,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -18041,6 +18063,18 @@
+@@ -18041,6 +18199,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -427,49 +662,49 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -18776,11 +18810,11 @@
+@@ -18776,11 +18946,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18779: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:18813: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18949: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18783: \$? = $ac_status" >&5
-+ echo "$as_me:18817: \$? = $ac_status" >&5
++ echo "$as_me:18953: \$? = $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.
-@@ -19066,11 +19100,11 @@
+@@ -19066,11 +19236,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19069: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19103: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19239: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19073: \$? = $ac_status" >&5
-+ echo "$as_me:19107: \$? = $ac_status" >&5
++ echo "$as_me:19243: \$? = $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.
-@@ -19170,11 +19204,11 @@
+@@ -19170,11 +19340,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19173: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:19207: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19343: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19177: \$? = $ac_status" >&5
-+ echo "$as_me:19211: \$? = $ac_status" >&5
++ echo "$as_me:19347: \$? = $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
-@@ -19434,12 +19468,13 @@
+@@ -19434,12 +19604,13 @@
$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
@@ -484,7 +719,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -19983,7 +20018,7 @@
+@@ -19983,7 +20154,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -493,7 +728,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -20626,13 +20661,11 @@
+@@ -20626,13 +20797,11 @@
# Some rework will be needed to allow for fast_install
# before this can be enabled.
hardcode_into_libs=yes
@@ -508,7 +743,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -20644,6 +20677,18 @@
+@@ -20644,6 +20813,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -527,7 +762,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -22155,7 +22200,7 @@
+@@ -22155,7 +22336,7 @@
fi
@@ -536,15 +771,485 @@
GST_MAJORMINOR=0.10
GST_REQS=0.10.12
GSTPLUG_REQS=0.10.12
-diff -x'*config.sub*' -x'*config.guess*' -Naur totem-2.20.1.old/ltmain.sh totem-2.20.1/ltmain.sh
---- totem-2.20.1.old/ltmain.sh 2007-08-29 13:52:51.000000000 +0200
-+++ totem-2.20.1/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
+@@ -27542,6 +27723,7 @@
+ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+ INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
++MSGMERGE!$MSGMERGE$ac_delim
+ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+ INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+ INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+@@ -27613,7 +27795,6 @@
+ BROWSER_PLUGIN_CFLAGS!$BROWSER_PLUGIN_CFLAGS$ac_delim
+ BROWSER_PLUGIN_LIBS!$BROWSER_PLUGIN_LIBS$ac_delim
+ DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
+-DBUS_LIBS!$DBUS_LIBS$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -27655,6 +27836,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++DBUS_LIBS!$DBUS_LIBS$ac_delim
+ DBUS_BIND!$DBUS_BIND$ac_delim
+ MOZILLA_XPIDL!$MOZILLA_XPIDL$ac_delim
+ MOZILLA_XPT_LINK!$MOZILLA_XPT_LINK$ac_delim
+@@ -27744,7 +27926,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/icons/16x16/Makefile.in totem-2.20.3/data/icons/16x16/Makefile.in
+--- totem-2.20.3.old/data/icons/16x16/Makefile.in 2008-01-07 17:30:49.000000000 +0100
++++ totem-2.20.3/data/icons/16x16/Makefile.in 2008-01-07 21:53:54.000000000 +0100
+@@ -178,6 +178,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/icons/22x22/Makefile.in totem-2.20.3/data/icons/22x22/Makefile.in
+--- totem-2.20.3.old/data/icons/22x22/Makefile.in 2008-01-07 17:30:50.000000000 +0100
++++ totem-2.20.3/data/icons/22x22/Makefile.in 2008-01-07 21:53:54.000000000 +0100
+@@ -178,6 +178,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/icons/24x24/Makefile.in totem-2.20.3/data/icons/24x24/Makefile.in
+--- totem-2.20.3.old/data/icons/24x24/Makefile.in 2008-01-07 17:30:50.000000000 +0100
++++ totem-2.20.3/data/icons/24x24/Makefile.in 2008-01-07 21:53:54.000000000 +0100
+@@ -178,6 +178,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/icons/32x32/Makefile.in totem-2.20.3/data/icons/32x32/Makefile.in
+--- totem-2.20.3.old/data/icons/32x32/Makefile.in 2008-01-07 17:30:50.000000000 +0100
++++ totem-2.20.3/data/icons/32x32/Makefile.in 2008-01-07 21:53:54.000000000 +0100
+@@ -178,6 +178,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/icons/Makefile.in totem-2.20.3/data/icons/Makefile.in
+--- totem-2.20.3.old/data/icons/Makefile.in 2008-01-07 17:30:50.000000000 +0100
++++ totem-2.20.3/data/icons/Makefile.in 2008-01-07 21:53:54.000000000 +0100
+@@ -180,6 +180,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/icons/scalable/Makefile.in totem-2.20.3/data/icons/scalable/Makefile.in
+--- totem-2.20.3.old/data/icons/scalable/Makefile.in 2008-01-07 17:30:50.000000000 +0100
++++ totem-2.20.3/data/icons/scalable/Makefile.in 2008-01-07 21:53:54.000000000 +0100
+@@ -178,6 +178,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/data/Makefile.in totem-2.20.3/data/Makefile.in
+--- totem-2.20.3.old/data/Makefile.in 2008-01-07 17:30:49.000000000 +0100
++++ totem-2.20.3/data/Makefile.in 2008-01-07 21:53:53.000000000 +0100
+@@ -199,6 +199,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/help/bg/Makefile.in totem-2.20.3/help/bg/Makefile.in
+--- totem-2.20.3.old/help/bg/Makefile.in 2008-01-07 17:30:51.000000000 +0100
++++ totem-2.20.3/help/bg/Makefile.in 2008-01-07 21:53:55.000000000 +0100
+@@ -233,6 +233,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/help/Makefile.in totem-2.20.3/help/Makefile.in
+--- totem-2.20.3.old/help/Makefile.in 2008-01-07 17:30:51.000000000 +0100
++++ totem-2.20.3/help/Makefile.in 2008-01-07 21:53:55.000000000 +0100
+@@ -205,6 +205,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/intltool-extract.in totem-2.20.3/intltool-extract.in
+--- totem-2.20.3.old/intltool-extract.in 2007-10-18 18:35:40.000000000 +0200
++++ totem-2.20.3/intltool-extract.in 2008-01-07 21:53:37.000000000 +0100
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-extract";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.36.2";
++my $VERSION = "0.37.0";
+
+ ## Loaded modules
+ use strict;
+@@ -161,7 +161,8 @@
+ --type=TYPE Specify the file type of FILENAME. Currently supports:
+ "gettext/glade", "gettext/ini", "gettext/keys"
+ "gettext/rfc822deb", "gettext/schemas",
+- "gettext/scheme", "gettext/xml", "gettext/quoted"
++ "gettext/scheme", "gettext/xml", "gettext/quoted",
++ "gettext/quotedxml"
+ -l, --local Writes output into current working directory
+ (conflicts with --update)
+ --update Writes output into the same directory the source file
+@@ -218,6 +219,7 @@
+ &type_schemas if $gettext_type eq "schemas";
+ &type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
++ &type_quotedxml if $gettext_type eq "quotedxml";
+ }
+
+ sub entity_decode_minimal
+@@ -731,6 +733,18 @@
+ }
+ }
+
++sub type_quotedxml {
++ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++ my $message = $1;
++ my $before = $`;
++ $message =~ s/\\\"/\"/g;
++ $message = entity_decode($message);
++ $before =~ s/[^\n]//g;
++ $messages{$message} = [];
++ $loc{$message} = length ($before) + 2;
++ }
++}
++
+ sub type_glade {
+ ### For translatable Glade XML files ###
+
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/intltool-merge.in totem-2.20.3/intltool-merge.in
+--- totem-2.20.3.old/intltool-merge.in 2007-10-18 18:35:40.000000000 +0200
++++ totem-2.20.3/intltool-merge.in 2008-01-07 21:53:37.000000000 +0100
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.36.2";
++my $VERSION = "0.37.0";
+
+ ## Loaded modules
+ use strict;
+@@ -61,6 +61,7 @@
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
+ my $QUOTED_STYLE_ARG = 0;
++my $QUOTEDXML_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -81,6 +82,7 @@
+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
++ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
+ "pass-through|p" => \$PASS_THROUGH_ARG,
+ "utf8|u" => \$UTF8_ARG,
+ "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -148,7 +150,7 @@
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- &keys_merge_translations;
++ &keys_merge_translations;
+ &finalize;
+ }
+ elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
+@@ -174,12 +176,12 @@
+ &rfc822deb_merge_translations;
+ &finalize;
+ }
+-elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
++elsif (($QUOTED_STYLE_ARG || $QUOTEDXML_STYLE_ARG) && @ARGV > 2)
+ {
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+- "ed_merge_translations;
++ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
+ &finalize;
+ }
+ else
+@@ -219,6 +221,7 @@
+ -s, --schemas-style includes translations in the schemas style
+ -r, --rfc822deb-style includes translations in the RFC822 style
+ --quoted-style includes translations in the quoted string style
++ --quotedxml-style includes translations in the quoted xml string style
+ -x, --xml-style includes translations in the standard xml style
+
+ Other options:
+@@ -292,10 +295,9 @@
+ {
+ next if /^#/;
+
+- if (/([-a-zA-Z_ at .]+)\n/)
++ for my $lang (split)
+ {
+- my $lang = $1;
+-
++ chomp ($lang);
+ my $po_file = $PO_DIR . "/" . $lang . ".po";
+ if (-e $po_file) {
+ $po_files_by_lang{$lang} = $po_file;
+@@ -576,6 +578,7 @@
+ return "&" if $_ == 38;
+ return "'" if $_ == 39;
+ return "<" if $_ == 60;
++ return ">" if $_ == 62;
+ return chr $_;
+ }
+
+@@ -1076,43 +1079,74 @@
+ close OUTPUT;
+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
+ }
+- }
+- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
+- binmode (OUTPUT) if $^O eq 'MSWin32';
+- my $tree = readXml($FILE);
+- print_header($FILE, \*OUTPUT);
+- parseTree(\*OUTPUT, $tree);
+- close OUTPUT;
+- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ if ( ! -d "C" ) {
++ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
++ }
++ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
++ } else {
++ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
++ binmode (OUTPUT) if $^O eq 'MSWin32';
++ my $tree = readXml($FILE);
++ print_header($FILE, \*OUTPUT);
++ parseTree(\*OUTPUT, $tree);
++ close OUTPUT;
++ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
++ }
+ }
+
+-sub keys_merge_translations
++sub keys_merge_translation
+ {
+- open INPUT, "<${FILE}" or die;
+- open OUTPUT, ">${OUTFILE}" or die;
++ my ($lang) = @_;
++
++ if ( ! -d $lang && $MULTIPLE_OUTPUT)
++ {
++ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
++ }
++
++ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
++ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+
+- while (<INPUT>)
++ while (<INPUT>)
+ {
+- if (s/^(\s*)_(\w+=(.*))/$1$2/)
++ if (s/^(\s*)_(\w+=(.*))/$1$2/)
+ {
+- my $string = $3;
++ my $string = $3;
+
+- print OUTPUT;
++ if (!$MULTIPLE_OUTPUT)
++ {
++ print OUTPUT;
+
+- my $non_translated_line = $_;
++ my $non_translated_line = $_;
+
+- for my $lang (sort keys %po_files_by_lang)
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ my $translation = $translations{$lang, $string};
++ next if !$translation;
++
++ $_ = $non_translated_line;
++ s/(\w+)=.*/[$lang]$1=$translation/;
++ print OUTPUT;
++ }
++ }
++ else
+ {
+- my $translation = $translations{$lang, $string};
+- next if !$translation;
++ my $non_translated_line = $_;
++ my $translation = $translations{$lang, $string};
++ $translation = $string if !$translation;
+
+ $_ = $non_translated_line;
+- s/(\w+)=.*/[$lang]$1=$translation/;
++ s/(\w+)=.*/$1=$translation/;
+ print OUTPUT;
+ }
+- }
+- else
++ }
++ else
+ {
+ print OUTPUT;
+ }
+@@ -1120,6 +1154,24 @@
+
+ close OUTPUT;
+ close INPUT;
++
++ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
++}
++
++sub keys_merge_translations
++{
++ if ($MULTIPLE_OUTPUT)
++ {
++ for my $lang (sort keys %po_files_by_lang)
++ {
++ keys_merge_translation ($lang);
++ }
++ keys_merge_translation ("C");
++ }
++ else
++ {
++ keys_merge_translation (".");
++ }
+ }
+
+ sub desktop_merge_translations
+@@ -1415,19 +1467,22 @@
+
+ sub quoted_translation
+ {
+- my ($lang, $string) = @_;
++ my ($xml_mode, $lang, $string) = @_;
+
++ $string = entity_decode($string) if $xml_mode;
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+-
++ $translation = entity_encode($translation) if $xml_mode;
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+ }
+
+ sub quoted_merge_translations
+ {
++ my ($xml_mode) = @_;
++
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+@@ -1442,7 +1497,7 @@
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
++ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/intltool-update.in totem-2.20.3/intltool-update.in
+--- totem-2.20.3.old/intltool-update.in 2007-10-18 18:35:40.000000000 +0200
++++ totem-2.20.3/intltool-update.in 2008-01-07 21:53:37.000000000 +0100
+@@ -30,7 +30,7 @@
+
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.36.2";
++my $VERSION = "0.37.0";
+ my $PACKAGE = "intltool";
+
+ ## Loaded modules
+@@ -334,7 +334,7 @@
+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
+- }, "$SRCDIR/..";
++ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
+
+ open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
+ @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
+@@ -434,8 +434,8 @@
+ last;
+ }
+
+- ## N_ Q_ and _ are the three macros defined in gi8n.h
+- if (/[NQ]?_ *\(QUOTEDTEXT/)
++ ## C_ N_ Q_ and _ are the macros defined in gi8n.h
++ if (/[CNQ]?_ *\(QUOTEDTEXT/)
+ {
+ if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+ ## Remove the first 3 chars and add newline
+@@ -777,7 +777,7 @@
+ my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
+ push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
++ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
+ push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
+ push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
+ my $xgettext_command = join ' ', @xgettext_argument;
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/lib/Makefile.in totem-2.20.3/lib/Makefile.in
+--- totem-2.20.3.old/lib/Makefile.in 2008-01-07 17:30:51.000000000 +0100
++++ totem-2.20.3/lib/Makefile.in 2008-01-07 21:53:55.000000000 +0100
+@@ -194,6 +194,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/ltmain.sh totem-2.20.3/ltmain.sh
+--- totem-2.20.3.old/ltmain.sh 2007-08-29 14:28:46.000000000 +0200
++++ totem-2.20.3/ltmain.sh 2007-11-27 22:23:09.000000000 +0100
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=1.5.24
-+VERSION="1.5.24 Debian 1.5.24-1ubuntu1"
++VERSION="1.5.24 Debian 1.5.24-2"
TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
@@ -572,3 +1277,190 @@
esac
;;
no)
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/Makefile.in totem-2.20.3/Makefile.in
+--- totem-2.20.3.old/Makefile.in 2008-01-07 17:30:55.000000000 +0100
++++ totem-2.20.3/Makefile.in 2008-01-07 21:53:59.000000000 +0100
+@@ -210,6 +210,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/backend/Makefile.in totem-2.20.3/src/backend/Makefile.in
+--- totem-2.20.3.old/src/backend/Makefile.in 2008-01-07 17:30:52.000000000 +0100
++++ totem-2.20.3/src/backend/Makefile.in 2008-01-07 21:53:56.000000000 +0100
+@@ -226,6 +226,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/Makefile.in totem-2.20.3/src/Makefile.in
+--- totem-2.20.3.old/src/Makefile.in 2008-01-07 17:30:51.000000000 +0100
++++ totem-2.20.3/src/Makefile.in 2008-01-07 21:53:56.000000000 +0100
+@@ -345,6 +345,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plparse/Makefile.in totem-2.20.3/src/plparse/Makefile.in
+--- totem-2.20.3.old/src/plparse/Makefile.in 2008-01-07 17:30:52.000000000 +0100
++++ totem-2.20.3/src/plparse/Makefile.in 2008-01-07 21:53:56.000000000 +0100
+@@ -247,6 +247,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/bemused/Makefile.in totem-2.20.3/src/plugins/bemused/Makefile.in
+--- totem-2.20.3.old/src/plugins/bemused/Makefile.in 2008-01-07 17:30:52.000000000 +0100
++++ totem-2.20.3/src/plugins/bemused/Makefile.in 2008-01-07 21:53:57.000000000 +0100
+@@ -201,6 +201,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/galago/Makefile.in totem-2.20.3/src/plugins/galago/Makefile.in
+--- totem-2.20.3.old/src/plugins/galago/Makefile.in 2008-01-07 17:30:53.000000000 +0100
++++ totem-2.20.3/src/plugins/galago/Makefile.in 2008-01-07 21:53:57.000000000 +0100
+@@ -202,6 +202,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/gromit/Makefile.in totem-2.20.3/src/plugins/gromit/Makefile.in
+--- totem-2.20.3.old/src/plugins/gromit/Makefile.in 2008-01-07 17:30:53.000000000 +0100
++++ totem-2.20.3/src/plugins/gromit/Makefile.in 2008-01-07 21:53:57.000000000 +0100
+@@ -201,6 +201,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/lirc/Makefile.in totem-2.20.3/src/plugins/lirc/Makefile.in
+--- totem-2.20.3.old/src/plugins/lirc/Makefile.in 2008-01-07 17:30:53.000000000 +0100
++++ totem-2.20.3/src/plugins/lirc/Makefile.in 2008-01-07 21:53:57.000000000 +0100
+@@ -202,6 +202,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/Makefile.in totem-2.20.3/src/plugins/Makefile.in
+--- totem-2.20.3.old/src/plugins/Makefile.in 2008-01-07 17:30:52.000000000 +0100
++++ totem-2.20.3/src/plugins/Makefile.in 2008-01-07 21:53:57.000000000 +0100
+@@ -228,6 +228,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/media-player-keys/Makefile.in totem-2.20.3/src/plugins/media-player-keys/Makefile.in
+--- totem-2.20.3.old/src/plugins/media-player-keys/Makefile.in 2008-01-07 17:30:53.000000000 +0100
++++ totem-2.20.3/src/plugins/media-player-keys/Makefile.in 2008-01-07 21:53:57.000000000 +0100
+@@ -207,6 +207,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/ontop/Makefile.in totem-2.20.3/src/plugins/ontop/Makefile.in
+--- totem-2.20.3.old/src/plugins/ontop/Makefile.in 2008-01-07 17:30:53.000000000 +0100
++++ totem-2.20.3/src/plugins/ontop/Makefile.in 2008-01-07 21:53:58.000000000 +0100
+@@ -201,6 +201,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/properties/Makefile.in totem-2.20.3/src/plugins/properties/Makefile.in
+--- totem-2.20.3.old/src/plugins/properties/Makefile.in 2008-01-07 17:30:54.000000000 +0100
++++ totem-2.20.3/src/plugins/properties/Makefile.in 2008-01-07 21:53:58.000000000 +0100
+@@ -214,6 +214,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/sample-python/Makefile.in totem-2.20.3/src/plugins/sample-python/Makefile.in
+--- totem-2.20.3.old/src/plugins/sample-python/Makefile.in 2008-01-07 17:30:54.000000000 +0100
++++ totem-2.20.3/src/plugins/sample-python/Makefile.in 2008-01-07 21:53:58.000000000 +0100
+@@ -168,6 +168,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/sample-vala/Makefile.in totem-2.20.3/src/plugins/sample-vala/Makefile.in
+--- totem-2.20.3.old/src/plugins/sample-vala/Makefile.in 2008-01-07 17:30:54.000000000 +0100
++++ totem-2.20.3/src/plugins/sample-vala/Makefile.in 2008-01-07 21:53:58.000000000 +0100
+@@ -168,6 +168,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/screensaver/Makefile.in totem-2.20.3/src/plugins/screensaver/Makefile.in
+--- totem-2.20.3.old/src/plugins/screensaver/Makefile.in 2008-01-07 17:30:54.000000000 +0100
++++ totem-2.20.3/src/plugins/screensaver/Makefile.in 2008-01-07 21:53:58.000000000 +0100
+@@ -203,6 +203,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/sidebar-test/Makefile.in totem-2.20.3/src/plugins/sidebar-test/Makefile.in
+--- totem-2.20.3.old/src/plugins/sidebar-test/Makefile.in 2008-01-07 17:30:54.000000000 +0100
++++ totem-2.20.3/src/plugins/sidebar-test/Makefile.in 2008-01-07 21:53:58.000000000 +0100
+@@ -202,6 +202,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur totem-2.20.3.old/src/plugins/skipto/Makefile.in totem-2.20.3/src/plugins/skipto/Makefile.in
+--- totem-2.20.3.old/src/plugins/skipto/Makefile.in 2008-01-07 17:30:54.000000000 +0100
++++ totem-2.20.3/src/plugins/skipto/Makefile.in 2008-01-07 21:53:59.000000000 +0100
+@@ -204,6 +204,7 @@
+ MOZILLA_XPT_LINK = @MOZILLA_XPT_LINK@
+ MSGFMT = @MSGFMT@
+ MSGFMT_OPTS = @MSGFMT_OPTS@
++MSGMERGE = @MSGMERGE@
+ NAUTILUS_CFLAGS = @NAUTILUS_CFLAGS@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ NO_STRICT_ALIASING_CFLAGS = @NO_STRICT_ALIASING_CFLAGS@
More information about the pkg-gnome-commits
mailing list