r23185 - in /desktop/unstable/totem/debian: changelog control control.in patches/02_python2.6.patch patches/90_autotools.patch patches/series
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Thu Mar 4 09:09:31 UTC 2010
Author: pochu
Date: Thu Mar 4 09:09:26 2010
New Revision: 23185
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23185
Log:
* debian/patches/02_python2.6.patch:
- Backport change from GIT to fix FTBFS with Python 2.6 as the
default interpreter. Closes: #571517.
* debian/patches/90_autotools.patch:
- Updated.
* debian/control.in:
- Standards-Version is 3.8.4, no changes needed.
Added:
desktop/unstable/totem/debian/patches/02_python2.6.patch
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/control
desktop/unstable/totem/debian/control.in
desktop/unstable/totem/debian/patches/90_autotools.patch
desktop/unstable/totem/debian/patches/series
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=23185&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Thu Mar 4 09:09:26 2010
@@ -1,11 +1,21 @@
-totem (2.28.5-2) UNRELEASED; urgency=low
-
+totem (2.28.5-2) unstable; urgency=low
+
+ [ Josselin Mouette ]
* totem-mozilla.links: removed. We don’t need iceweasel-specific
links, it is able to use the files in /usr/lib/mozilla/plugins.
Closes: #569891.
* Require totem-common = ${source:Version}. Closes: #571164.
- -- Josselin Mouette <joss at debian.org> Mon, 15 Feb 2010 20:59:53 +0100
+ [ Emilio Pozuelo Monfort ]
+ * debian/patches/02_python2.6.patch:
+ - Backport change from GIT to fix FTBFS with Python 2.6 as the
+ default interpreter. Closes: #571517.
+ * debian/patches/90_autotools.patch:
+ - Updated.
+ * debian/control.in:
+ - Standards-Version is 3.8.4, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Thu, 04 Mar 2010 10:06:44 +0100
totem (2.28.5-1) unstable; urgency=low
Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=23185&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control [utf-8] (original)
+++ desktop/unstable/totem/debian/control [utf-8] Thu Mar 4 09:09:26 2010
@@ -58,7 +58,7 @@
libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libgalago-dev (>= 0.5.2),
libgdata-dev (>= 0.4.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.gnome.org/projects/totem/
Package: totem
Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=23185&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in [utf-8] (original)
+++ desktop/unstable/totem/debian/control.in [utf-8] Thu Mar 4 09:09:26 2010
@@ -53,7 +53,7 @@
libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libgalago-dev (>= 0.5.2),
libgdata-dev (>= 0.4.0)
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Homepage: http://www.gnome.org/projects/totem/
Package: totem
Added: desktop/unstable/totem/debian/patches/02_python2.6.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/02_python2.6.patch?rev=23185&op=file
==============================================================================
--- desktop/unstable/totem/debian/patches/02_python2.6.patch (added)
+++ desktop/unstable/totem/debian/patches/02_python2.6.patch [utf-8] Thu Mar 4 09:09:26 2010
@@ -1,0 +1,25 @@
+From 6d323117f05bdf74c3b9b0914beb393bb8c67874 Mon Sep 17 00:00:00 2001
+From: Sébastien Bacher <seb128 at ubuntu.com>
+Date: Tue, 08 Dec 2009 23:48:22 +0000
+Subject: don't use LOCALMODLIBS for the build
+
+https://bugzilla.gnome.org/show_bug.cgi?id=604077
+---
+diff --git a/configure.in b/configure.in
+index e32afc3..c815fd0 100644
+--- a/configure.in
++++ b/configure.in
+@@ -318,10 +318,9 @@ if test "x$have_python" != "xno"; then
+ PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
+ fi
+ PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
+- PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+- PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
++ PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
+ AC_SUBST([PYTHON_LIBS])
+ AC_SUBST([PYTHON_LIB_LOC])
+ AC_SUBST([PYTHON_CFLAGS])
+--
+cgit v0.8.3.1
Modified: desktop/unstable/totem/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/90_autotools.patch?rev=23185&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] Thu Mar 4 09:09:26 2010
@@ -1,5 +1,11 @@
--- a/aclocal.m4
+++ b/aclocal.m4
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -252,8 +258,62 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+@@ -9133,7 +9174,7 @@
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -9149,7 +9190,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+@@ -10040,6 +10081,14 @@
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
++ *)
++ case $am_py_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
+ esac
+ ])
+ AC_SUBST([pythondir], [$am_cv_python_pythondir])
+@@ -10070,6 +10119,14 @@
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
++ *)
++ case $am_py_exec_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
+ esac
+ ])
+ AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -109,6 +109,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -280,8 +340,32 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -381,7 +386,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -406,7 +411,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -106,6 +106,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -310,6 +394,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/bindings/vala/Makefile.in
+++ b/bindings/vala/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -70,6 +70,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -338,6 +428,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/browser-plugin/Makefile.in
+++ b/browser-plugin/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -333,6 +333,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -5211,9 +5307,8 @@
$as_echo "$MSGFMT" >&6; }
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
+-$as_echo "no" >&6; }
+-fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
@@ -5303,7 +5398,9 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -6678,7 +6775,7 @@
/* end confdefs.h. */
int
-@@ -7528,82 +6477,33 @@
+@@ -7528,36 +6477,12 @@
return 0;
}
_ACEOF
@@ -6719,10 +6816,10 @@
/* end confdefs.h. */
int
- main ()
--{
--
-- ;
+@@ -7565,45 +6490,20 @@
+ {
+
+ ;
- return 0;
-}
-_ACEOF
@@ -6749,9 +6846,7 @@
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-+{
-
-+ ;
+-
+ return 0;
+}
+_ACEOF
@@ -8769,10 +8864,12 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
@@ -8780,12 +8877,10 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
@@ -9152,17 +9247,17 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -11154,94 +9760,46 @@
+@@ -11153,95 +9759,47 @@
+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
+- # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
+-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
@@ -9191,6 +9286,9 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++ # not just through cpp. "Syntax error" is here to catch this case.
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
+#ifdef __STDC__
+# include <limits.h>
+#else
@@ -10212,23 +10310,19 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_dld_shl_load=yes
- else
+- ac_cv_lib_dld_shl_load=yes
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
-+ ac_cv_lib_dld_shl_load=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
+-LIBS=$ac_check_lib_save_LIBS
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
@@ -10306,17 +10400,23 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_dld_shl_load=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
--fi
++ ac_cv_lib_dld_shl_load=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
@@ -12200,7 +12300,7 @@
fi
-@@ -20277,25 +18387,14 @@
+@@ -20277,14 +18387,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12214,6 +12314,16 @@
echo "$GST_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met:
++ as_fn_error "Package requirements ($MM) were not met:
+
+ $GST_PKG_ERRORS
+
+@@ -20294,33 +18404,11 @@
+ Alternatively, you may set the environment variables GST_CFLAGS
+ and GST_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements ($MM) were not met:
-
-$GST_PKG_ERRORS
-
@@ -12223,16 +12333,6 @@
-Alternatively, you may set the environment variables GST_CFLAGS
-and GST_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements ($MM) were not met:
-+ as_fn_error "Package requirements ($MM) were not met:
-
- $GST_PKG_ERRORS
-
-@@ -20305,22 +18404,11 @@
- Alternatively, you may set the environment variables GST_CFLAGS
- and GST_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -13362,16 +13462,10 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21431,55 +19344,28 @@
- char XTestFakeKeyEvent ();
- int
- main ()
--{
--return XTestFakeKeyEvent ();
-- ;
-- return 0;
--}
--_ACEOF
+@@ -21437,49 +19350,22 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -13393,12 +13487,6 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-+{
-+return XTestFakeKeyEvent ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_Xtst_XTestFakeKeyEvent=yes
else
@@ -13765,7 +13853,18 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -21821,7 +19679,7 @@
+@@ -21818,10 +19676,18 @@
+ am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
+ am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
+ ;;
++ *)
++ case $am_py_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
esac
fi
@@ -13774,7 +13873,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -21830,9 +19688,9 @@
+@@ -21830,9 +19696,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -13786,7 +13885,18 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -21851,7 +19709,7 @@
+@@ -21848,10 +19714,18 @@
+ am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
+ am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
+ ;;
++ *)
++ case $am_py_exec_prefix in
++ /usr|/System*) ;;
++ *)
++ am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
++ ;;
++ esac
++ ;;
esac
fi
@@ -13795,7 +13905,19 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -21894,52 +19752,56 @@
+@@ -21881,10 +19755,9 @@
+ PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
+ fi
+ PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
+- PYTHON_LOCALMODLIBS=`sed -n -e 's/^LOCALMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ PYTHON_BASEMODLIBS=`sed -n -e 's/^BASEMODLIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+ PYTHON_OTHER_LIBS=`sed -n -e 's/^LIBS=\(.*\)/\1/p' $PYTHON_MAKEFILE`
+- PYTHON_EXTRA_LIBS="$PYTHON_LOCALMODLIBS $PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
++ PYTHON_EXTRA_LIBS="$PYTHON_BASEMODLIBS $PYTHON_OTHER_LIBS"
+
+
+
+@@ -21894,52 +19767,56 @@
pkg_failed=no
@@ -13873,7 +13995,7 @@
fi
-@@ -21952,30 +19814,28 @@
+@@ -21952,30 +19829,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13912,7 +14034,7 @@
$as_echo "$as_me: WARNING: Disabling python support" >&2;}
fi
-@@ -21983,21 +19843,19 @@
+@@ -21983,21 +19858,19 @@
have_python=no
if test "x$enable_python" = "xyes"; then
@@ -13938,7 +14060,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -22007,22 +19865,22 @@
+@@ -22007,22 +19880,22 @@
fi
if test "x$have_python" != "xno"; then
@@ -13967,7 +14089,7 @@
$as_echo "$PYGTK_H2DEF" >&6; }
-@@ -22033,13 +19891,9 @@
+@@ -22033,13 +19906,9 @@
FLAGS="-fno-strict-aliasing"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $FLAGS"
@@ -13983,7 +14105,7 @@
/* end confdefs.h. */
int
-@@ -22050,35 +19904,14 @@
+@@ -22050,35 +19919,14 @@
return 0;
}
_ACEOF
@@ -14022,7 +14144,7 @@
$as_echo "$compiler_has_option" >&6; }
if test $compiler_has_option = yes; then
NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-@@ -22089,9 +19922,7 @@
+@@ -22089,9 +19937,7 @@
if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
enable_python=yes
@@ -14033,7 +14155,7 @@
fi
-@@ -22104,54 +19935,58 @@
+@@ -22104,54 +19950,58 @@
fi
@@ -14114,7 +14236,7 @@
fi
-@@ -22164,14 +19999,14 @@
+@@ -22164,14 +20014,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14132,7 +14254,7 @@
$as_echo "no" >&6; }
with_vala=no
elif test $pkg_failed = untried; then
-@@ -22179,7 +20014,7 @@
+@@ -22179,7 +20029,7 @@
else
VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
VALA_LIBS=$pkg_cv_VALA_LIBS
@@ -14141,7 +14263,7 @@
$as_echo "yes" >&6; }
with_vala=yes
fi
-@@ -22187,9 +20022,7 @@
+@@ -22187,9 +20037,7 @@
VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
elif test "x$enable_vala" = "xyes"; then
@@ -14152,7 +14274,7 @@
fi
fi
if test "x$with_vala" = "xyes"; then
-@@ -22208,18 +20041,16 @@
+@@ -22208,18 +20056,16 @@
plugin_error_or_ignore()
{
if test "${error_on_bad_plugin}" = "1" ; then
@@ -14174,7 +14296,7 @@
withval=$with_plugins;
else
with_plugins=autodetect
-@@ -22266,40 +20097,44 @@
+@@ -22266,40 +20112,44 @@
screensaver)
pkg_failed=no
@@ -14238,7 +14360,7 @@
fi
-@@ -22312,25 +20147,14 @@
+@@ -22312,25 +20162,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14267,7 +14389,7 @@
$SCREENSAVER_PKG_ERRORS
-@@ -22340,12 +20164,11 @@
+@@ -22340,12 +20179,11 @@
Alternatively, you may set the environment variables SCREENSAVER_CFLAGS
and SCREENSAVER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14283,7 +14405,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22354,22 +20177,11 @@
+@@ -22354,22 +20192,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14308,7 +14430,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -22377,40 +20189,44 @@
+@@ -22377,40 +20204,44 @@
galago)
pkg_failed=no
@@ -14372,7 +14494,7 @@
fi
-@@ -22423,14 +20239,14 @@
+@@ -22423,14 +20254,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14390,7 +14512,7 @@
$as_echo "no" >&6; }
HAVE_LIBGALAGO=no
elif test $pkg_failed = untried; then
-@@ -22438,7 +20254,7 @@
+@@ -22438,7 +20269,7 @@
else
LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS
LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS
@@ -14399,7 +14521,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGALAGO=yes
fi
-@@ -22456,40 +20272,44 @@
+@@ -22456,40 +20287,44 @@
media-player-keys)
pkg_failed=no
@@ -14463,7 +14585,7 @@
fi
-@@ -22502,14 +20322,14 @@
+@@ -22502,14 +20337,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14481,7 +14603,7 @@
$as_echo "no" >&6; }
HAVE_MEDIA_PLAYER_KEYS=no
elif test $pkg_failed = untried; then
-@@ -22517,7 +20337,7 @@
+@@ -22517,7 +20352,7 @@
else
MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS
MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS
@@ -14490,7 +14612,7 @@
$as_echo "yes" >&6; }
HAVE_MEDIA_PLAYER_KEYS=yes
fi
-@@ -22527,18 +20347,14 @@
+@@ -22527,18 +20362,14 @@
fi
;;
lirc)
@@ -14512,7 +14634,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -22556,176 +20372,20 @@
+@@ -22556,176 +20387,20 @@
return 0;
}
_ACEOF
@@ -14697,7 +14819,7 @@
LIRC_LIBS="-llirc_client"
HAVE_LIRC=yes
else
-@@ -22746,40 +20406,123 @@
+@@ -22746,40 +20421,123 @@
mythtv)
pkg_failed=no
@@ -14843,7 +14965,7 @@
fi
-@@ -22792,67 +20535,86 @@
+@@ -22792,67 +20550,86 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14961,7 +15083,7 @@
fi
-@@ -22865,14 +20627,14 @@
+@@ -22865,14 +20642,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14979,7 +15101,7 @@
$as_echo "no" >&6; }
HAVE_BLUEZ=no
elif test $pkg_failed = untried; then
-@@ -22880,7 +20642,7 @@
+@@ -22880,7 +20657,7 @@
else
BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS
BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS
@@ -14988,7 +15110,7 @@
$as_echo "yes" >&6; }
HAVE_BLUEZ=yes
fi
-@@ -22892,40 +20654,44 @@
+@@ -22892,40 +20669,44 @@
publish)
pkg_failed=no
@@ -15052,7 +15174,7 @@
fi
-@@ -22938,14 +20704,14 @@
+@@ -22938,14 +20719,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15070,7 +15192,7 @@
$as_echo "no" >&6; }
HAVE_LIBEPC=no
elif test $pkg_failed = untried; then
-@@ -22953,7 +20719,7 @@
+@@ -22953,7 +20734,7 @@
else
LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
@@ -15079,7 +15201,7 @@
$as_echo "yes" >&6; }
HAVE_LIBEPC=yes
fi
-@@ -22965,40 +20731,44 @@
+@@ -22965,40 +20746,44 @@
tracker)
pkg_failed=no
@@ -15143,7 +15265,7 @@
fi
-@@ -23011,14 +20781,14 @@
+@@ -23011,14 +20796,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15161,7 +15283,7 @@
$as_echo "no" >&6; }
HAVE_TRACKER=no
elif test $pkg_failed = untried; then
-@@ -23026,7 +20796,7 @@
+@@ -23026,7 +20811,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -15170,7 +15292,7 @@
$as_echo "yes" >&6; }
HAVE_TRACKER=yes
fi
-@@ -23044,40 +20814,44 @@
+@@ -23044,40 +20829,44 @@
thumbnail)
pkg_failed=no
@@ -15234,7 +15356,7 @@
fi
-@@ -23090,14 +20864,14 @@
+@@ -23090,14 +20879,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15252,7 +15374,7 @@
$as_echo "no" >&6; }
HAVE_GLIB_2_15=no
elif test $pkg_failed = untried; then
-@@ -23105,7 +20879,7 @@
+@@ -23105,7 +20894,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -15261,7 +15383,7 @@
$as_echo "yes" >&6; }
HAVE_GLIB_2_15=yes
fi
-@@ -23117,40 +20891,44 @@
+@@ -23117,40 +20906,44 @@
brasero-disc-recorder)
pkg_failed=no
@@ -15325,7 +15447,7 @@
fi
-@@ -23163,14 +20941,14 @@
+@@ -23163,14 +20956,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15343,7 +15465,7 @@
$as_echo "no" >&6; }
BUILD_RECORDER=no
elif test $pkg_failed = untried; then
-@@ -23178,7 +20956,7 @@
+@@ -23178,7 +20971,7 @@
else
DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS
DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS
@@ -15352,7 +15474,7 @@
$as_echo "yes" >&6; }
BUILD_RECORDER=yes
fi
-@@ -23190,40 +20968,44 @@
+@@ -23190,40 +20983,44 @@
youtube)
pkg_failed=no
@@ -15416,7 +15538,7 @@
fi
-@@ -23236,14 +21018,14 @@
+@@ -23236,14 +21033,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15434,7 +15556,7 @@
$as_echo "no" >&6; }
HAVE_LIBGDATA=no
elif test $pkg_failed = untried; then
-@@ -23251,7 +21033,7 @@
+@@ -23251,7 +21048,7 @@
else
LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS
LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS
@@ -15443,7 +15565,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGDATA=yes
fi
-@@ -23260,23 +21042,18 @@
+@@ -23260,23 +21057,18 @@
add_plugin="0"
fi
@@ -15472,7 +15594,7 @@
fi
;;
esac
-@@ -23290,9 +21067,9 @@
+@@ -23290,9 +21082,9 @@
ALL_PLUGINS=$allowed_plugins
PLUGINS=$used_plugins2
@@ -15484,7 +15606,7 @@
$as_echo "$PLUGINS" >&6; }
-@@ -23302,24 +21079,22 @@
+@@ -23302,24 +21094,22 @@
# Browser plugins
# ***************
@@ -15513,7 +15635,7 @@
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-@@ -23327,24 +21102,25 @@
+@@ -23327,24 +21117,25 @@
pkg_failed=no
@@ -15548,7 +15670,7 @@
pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
gio-2.0
x11
-@@ -23352,24 +21128,26 @@
+@@ -23352,24 +21143,26 @@
else
pkg_failed=yes
fi
@@ -15585,7 +15707,7 @@
pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
gio-2.0
x11
-@@ -23377,8 +21155,9 @@
+@@ -23377,8 +21170,9 @@
else
pkg_failed=yes
fi
@@ -15597,7 +15719,7 @@
fi
-@@ -23391,20 +21170,20 @@
+@@ -23391,20 +21185,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15623,7 +15745,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23412,7 +21191,7 @@
+@@ -23412,7 +21206,7 @@
else
BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS
BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
@@ -15632,7 +15754,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23422,58 +21201,58 @@
+@@ -23422,58 +21216,58 @@
# Earlier versions misdetect playlists
if test -n "$PKG_CONFIG" && \
@@ -15719,7 +15841,7 @@
fi
-@@ -23486,14 +21265,14 @@
+@@ -23486,14 +21280,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15737,7 +15859,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23501,7 +21280,7 @@
+@@ -23501,7 +21295,7 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -15746,7 +15868,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23509,9 +21288,9 @@
+@@ -23509,9 +21303,9 @@
DBUSBINDIR="`echo $DBUSLIBDIR | sed -e s/lib/bin/`"
# Extract the first word of "dbus-binding-tool", so it can be a program name with args.
set dummy dbus-binding-tool; ac_word=$2
@@ -15758,7 +15880,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BIND in
-@@ -23525,14 +21304,14 @@
+@@ -23525,14 +21319,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15776,7 +15898,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BIND" && ac_cv_path_DBUS_BIND="no"
-@@ -23541,16 +21320,16 @@
+@@ -23541,16 +21335,16 @@
fi
DBUS_BIND=$ac_cv_path_DBUS_BIND
if test -n "$DBUS_BIND"; then
@@ -15796,7 +15918,7 @@
$as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}
enable_browser_plugins=no
fi
-@@ -23566,13 +21345,9 @@
+@@ -23566,13 +21360,9 @@
__SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-fno-rtti $CXXFLAGS"
@@ -15812,7 +15934,7 @@
/* end confdefs.h. */
int
-@@ -23583,34 +21358,13 @@
+@@ -23583,34 +21373,13 @@
return 0;
}
_ACEOF
@@ -15850,7 +15972,7 @@
$as_echo "$have_no_rtti_flag" >&6; }
CXXFLAGS=$__SAVE_CXXFLAGS
-@@ -23639,64 +21393,64 @@
+@@ -23639,64 +21408,64 @@
if test "$enable_browser_plugins" = "yes"; then
@@ -15930,7 +16052,7 @@
$as_echo "$enable_cone_plugin" >&6; }
fi
-@@ -23744,13 +21498,11 @@
+@@ -23744,13 +21513,11 @@
# Check whether --enable-nautilus was given.
@@ -15946,7 +16068,7 @@
esac
else
ENABLE_NAUTILUS=yes
-@@ -23759,40 +21511,44 @@
+@@ -23759,40 +21526,44 @@
if test x$ENABLE_NAUTILUS = "xyes" ; then
pkg_failed=no
@@ -16010,7 +16132,7 @@
fi
-@@ -23805,14 +21561,14 @@
+@@ -23805,14 +21576,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16028,7 +16150,7 @@
$as_echo "no" >&6; }
HAVE_NAUTILUS=no
elif test $pkg_failed = untried; then
-@@ -23820,7 +21576,7 @@
+@@ -23820,7 +21591,7 @@
else
NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -16037,7 +16159,7 @@
$as_echo "yes" >&6; }
HAVE_NAUTILUS=yes
fi
-@@ -23828,7 +21584,7 @@
+@@ -23828,7 +21599,7 @@
# Check whether --with-nautilusdir was given.
@@ -16046,7 +16168,7 @@
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
else
ac_with_nautilusdir=""
-@@ -23840,15 +21596,13 @@
+@@ -23840,15 +21611,13 @@
if test x$HAVE_NAUTILUS = "xyes"; then
@@ -16064,7 +16186,7 @@
$as_echo "$as_me: installing nautilus plugin in ${ac_with_nautilusdir}" >&6;}
NAUTILUSDIR=${ac_with_nautilusdir}
-@@ -23865,7 +21619,7 @@
+@@ -23865,7 +21634,7 @@
# Check whether --with-dbus was given.
@@ -16073,7 +16195,7 @@
withval=$with_dbus;
else
with_dbus=auto
-@@ -23874,40 +21628,44 @@
+@@ -23874,40 +21643,44 @@
if test "x$with_dbus" != "xno"; then
pkg_failed=no
@@ -16137,7 +16259,7 @@
fi
-@@ -23920,14 +21678,14 @@
+@@ -23920,14 +21693,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16155,7 +16277,7 @@
$as_echo "no" >&6; }
enable_dbus=no
elif test $pkg_failed = untried; then
-@@ -23935,20 +21693,16 @@
+@@ -23935,20 +21708,16 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -16179,7 +16301,7 @@
fi
fi
-@@ -23963,9 +21717,9 @@
+@@ -23963,9 +21732,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -16191,7 +16313,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -23978,14 +21732,14 @@
+@@ -23978,14 +21747,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16209,7 +16331,7 @@
IFS=$as_save_IFS
;;
-@@ -23993,10 +21747,10 @@
+@@ -23993,10 +21762,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -16222,7 +16344,7 @@
$as_echo "no" >&6; }
fi
-@@ -24010,13 +21764,13 @@
+@@ -24010,13 +21779,13 @@
# Check whether --with-gconf-source was given.
@@ -16238,7 +16360,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -24025,22 +21779,20 @@
+@@ -24025,22 +21794,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -16265,7 +16387,7 @@
esac
fi
-@@ -24066,7 +21818,7 @@
+@@ -24066,7 +21833,7 @@
# Check whether --enable-debug was given.
@@ -16274,7 +16396,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -24075,16 +21827,14 @@
+@@ -24075,16 +21842,14 @@
if test x$enable_debug = xyes ; then
@@ -16293,7 +16415,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -24115,13 +21865,9 @@
+@@ -24115,13 +21880,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -16309,7 +16431,7 @@
/* end confdefs.h. */
int
-@@ -24132,35 +21878,14 @@
+@@ -24132,35 +21893,14 @@
return 0;
}
_ACEOF
@@ -16348,7 +16470,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -24174,26 +21899,24 @@
+@@ -24174,26 +21914,24 @@
fi
;;
*)
@@ -16380,7 +16502,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -24208,7 +21931,7 @@
+@@ -24208,7 +21946,7 @@
esac
fi
fi
@@ -16389,7 +16511,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -24216,14 +21939,14 @@
+@@ -24216,14 +21954,14 @@
# Check whether --enable-cxx-warnings was given.
@@ -16406,7 +16528,7 @@
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
warnCXXFLAGS=
if test "x$GXX" != xyes; then
-@@ -24243,18 +21966,18 @@
+@@ -24243,18 +21981,18 @@
fi
fi
fi
@@ -16428,7 +16550,7 @@
$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
complCXXFLAGS=
if test "x$enable_iso_cxx" != "xno"; then
-@@ -24270,7 +21993,7 @@
+@@ -24270,7 +22008,7 @@
esac
fi
fi
@@ -16437,7 +16559,7 @@
$as_echo "$complCXXFLAGS" >&6; }
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -24291,8 +22014,136 @@
+@@ -24291,8 +22029,136 @@
@@ -16575,7 +16697,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -24302,7 +22153,7 @@
+@@ -24302,7 +22168,7 @@
# Check whether --enable-gtk-doc was given.
@@ -16584,7 +16706,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -24311,68 +22162,40 @@
+@@ -24311,68 +22177,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -16671,7 +16793,7 @@
if test x$enable_gtk_doc = xyes; then
-@@ -24383,6 +22206,22 @@
+@@ -24383,6 +22221,22 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -16694,7 +16816,7 @@
if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -24391,6 +22230,14 @@
+@@ -24391,6 +22245,14 @@
GTK_DOC_USE_LIBTOOL_FALSE=
fi
@@ -16709,7 +16831,7 @@
# This macro expands DIR and assigns it to RET.
-@@ -24409,22 +22256,18 @@
+@@ -24409,22 +22271,18 @@
# Check whether --enable-run-in-source-tree was given.
@@ -16735,7 +16857,7 @@
fi
-@@ -24443,7 +22286,7 @@
+@@ -24443,7 +22301,7 @@
@@ -16744,7 +16866,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -24472,13 +22315,13 @@
+@@ -24472,13 +22330,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16760,7 +16882,7 @@
esac ;;
esac
done
-@@ -24486,8 +22329,8 @@
+@@ -24486,8 +22344,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16771,7 +16893,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -24510,11 +22353,11 @@
+@@ -24510,11 +22368,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -16785,7 +16907,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -24534,8 +22377,8 @@
+@@ -24534,8 +22392,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -16796,7 +16918,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -24543,11 +22386,8 @@
+@@ -24543,11 +22401,8 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -16810,7 +16932,7 @@
fi
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
-@@ -24558,185 +22398,126 @@
+@@ -24558,185 +22413,126 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -17059,7 +17181,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -24746,17 +22527,18 @@
+@@ -24746,17 +22542,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -17085,7 +17207,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -24764,23 +22546,15 @@
+@@ -24764,23 +22561,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -17114,7 +17236,7 @@
as_nl='
'
export as_nl
-@@ -24788,7 +22562,13 @@
+@@ -24788,7 +22577,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -17129,7 +17251,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -24799,7 +22579,7 @@
+@@ -24799,7 +22594,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -17138,7 +17260,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -24822,13 +22602,6 @@
+@@ -24822,13 +22617,6 @@
}
fi
@@ -17152,7 +17274,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -24838,15 +22611,15 @@
+@@ -24838,15 +22626,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -17171,7 +17293,7 @@
IFS=$as_save_IFS
;;
-@@ -24858,12 +22631,16 @@
+@@ -24858,12 +22646,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -17192,7 +17314,7 @@
done
PS1='$ '
PS2='> '
-@@ -24875,7 +22652,89 @@
+@@ -24875,7 +22667,89 @@
LANGUAGE=C
export LANGUAGE
@@ -17283,7 +17405,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -24889,8 +22748,12 @@
+@@ -24889,8 +22763,12 @@
as_basename=false
fi
@@ -17297,7 +17419,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -24910,76 +22773,25 @@
+@@ -24910,76 +22788,25 @@
}
s/.*/./; q'`
@@ -17385,7 +17507,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -25008,8 +22820,56 @@
+@@ -25008,8 +22835,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17443,7 +17565,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -25028,10 +22888,10 @@
+@@ -25028,10 +22903,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -17456,7 +17578,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -25046,13 +22906,19 @@
+@@ -25046,13 +22921,19 @@
exec 6>&1
@@ -17478,7 +17600,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25084,13 +22950,15 @@
+@@ -25084,13 +22965,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17497,7 +17619,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -25109,16 +22977,17 @@
+@@ -25109,16 +22992,17 @@
Configuration commands:
$config_commands
@@ -17519,7 +17641,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -25154,6 +23023,8 @@
+@@ -25154,6 +23038,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -17528,7 +17650,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -25161,20 +23032,19 @@
+@@ -25161,20 +23047,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -17553,7 +17675,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -25182,11 +23052,10 @@
+@@ -25182,11 +23067,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -17568,7 +17690,7 @@
ac_need_defaults=false ;;
esac
-@@ -25599,6 +23468,7 @@
+@@ -25599,6 +23483,7 @@
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
@@ -17576,7 +17698,7 @@
"src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;;
"src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;;
"src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;;
-@@ -25647,9 +23517,7 @@
+@@ -25647,9 +23532,7 @@
"docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17587,7 +17709,7 @@
esac
done
-@@ -25676,7 +23544,7 @@
+@@ -25676,7 +23559,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17596,7 +17718,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -25687,11 +23555,7 @@
+@@ -25687,11 +23570,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17609,7 +17731,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -25699,10 +23563,16 @@
+@@ -25699,10 +23578,16 @@
if test -n "$CONFIG_FILES"; then
@@ -17628,7 +17750,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -25716,24 +23586,18 @@
+@@ -25716,24 +23601,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17656,7 +17778,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25755,7 +23619,7 @@
+@@ -25755,7 +23634,7 @@
t delim
:nl
h
@@ -17665,7 +17787,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -25769,7 +23633,7 @@
+@@ -25769,7 +23648,7 @@
t nl
:delim
h
@@ -17674,7 +17796,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -25822,9 +23686,7 @@
+@@ -25822,9 +23701,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17685,7 +17807,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -25865,9 +23727,7 @@
+@@ -25865,9 +23742,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17696,7 +17818,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25952,9 +23812,7 @@
+@@ -25952,9 +23827,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17707,7 +17829,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -25967,9 +23825,7 @@
+@@ -25967,9 +23840,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17718,7 +17840,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -25997,12 +23853,10 @@
+@@ -25997,12 +23868,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17733,7 +17855,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -26013,7 +23867,7 @@
+@@ -26013,7 +23882,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17742,7 +17864,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -26026,9 +23880,7 @@
+@@ -26026,9 +23895,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17753,7 +17875,7 @@
esac
;;
esac
-@@ -26056,47 +23908,7 @@
+@@ -26056,47 +23923,7 @@
q
}
s/.*/./; q'`
@@ -17802,7 +17924,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -26153,7 +23965,6 @@
+@@ -26153,7 +23980,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -17810,7 +17932,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -26163,12 +23974,11 @@
+@@ -26163,12 +23989,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17825,7 +17947,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -26178,7 +23988,7 @@
+@@ -26178,7 +24003,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17834,7 +17956,7 @@
esac
_ACEOF
-@@ -26207,14 +24017,12 @@
+@@ -26207,14 +24032,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -17851,7 +17973,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -26224,9 +24032,7 @@
+@@ -26224,9 +24047,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -17862,7 +17984,7 @@
;;
:H)
#
-@@ -26237,25 +24043,19 @@
+@@ -26237,25 +24058,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -17892,7 +18014,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -26293,7 +24093,7 @@
+@@ -26293,7 +24108,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17901,7 +18023,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -26388,47 +24188,7 @@
+@@ -26388,47 +24203,7 @@
q
}
s/.*/./; q'`
@@ -17950,7 +18072,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -27242,9 +25002,7 @@
+@@ -27242,9 +25017,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17961,7 +18083,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -27267,15 +25025,12 @@
+@@ -27267,15 +25040,12 @@
done # for ac_tag
@@ -17979,7 +18101,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -27296,37 +25051,37 @@
+@@ -27296,37 +25066,37 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -18027,7 +18149,7 @@
$as_echo "$as_me: Vala binding support disabled" >&6;}
fi
if test "x${PLUGINS}" != "x" ; then
-@@ -27334,112 +25089,112 @@
+@@ -27334,112 +25104,112 @@
for plugin in ${PLUGINS}; do
case ${allowed_plugin} in
${plugin})
@@ -18172,6 +18294,12 @@
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18200,6 +18328,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18228,6 +18362,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18256,6 +18396,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18284,6 +18430,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/data/icons/48x48/Makefile.in
+++ b/data/icons/48x48/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18312,6 +18464,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18338,8 +18496,32 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -379,7 +384,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -404,7 +409,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- a/data/icons/scalable/Makefile.in
+++ b/data/icons/scalable/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18368,6 +18550,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/data/Makefile.in
+++ b/data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -141,6 +141,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18394,8 +18582,32 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -605,7 +610,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -630,7 +635,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18422,8 +18634,32 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -379,7 +384,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -404,7 +409,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -76,6 +76,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18452,6 +18688,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/help/bg/Makefile.in
+++ b/help/bg/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -132,6 +132,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18480,6 +18722,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/help/Makefile.in
+++ b/help/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -132,6 +132,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18506,8 +18754,32 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -528,7 +533,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -553,7 +558,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -104,6 +104,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18616,6 +18888,12 @@
no)
--- a/Makefile.in
+++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18642,6 +18920,56 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -442,7 +447,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -467,7 +472,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -637,7 +642,8 @@
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -680,17 +686,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -129,7 +129,7 @@
@@ -18655,6 +18983,12 @@
install-exec installcheck:
--- a/src/backend/Makefile.in
+++ b/src/backend/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -121,6 +121,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18683,6 +19017,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/Makefile.in
+++ b/src/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -343,6 +343,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18709,10 +19049,28 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -1521,7 +1526,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -1546,7 +1551,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- /dev/null
+++ b/src/plugins/bbc/Makefile.in
@@ -0,0 +1,596 @@
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19310,6 +19668,12 @@
+.NOEXPORT:
--- a/src/plugins/bemused/Makefile.in
+++ b/src/plugins/bemused/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19338,6 +19702,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/brasero-disc-recorder/Makefile.in
+++ b/src/plugins/brasero-disc-recorder/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -128,6 +128,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19366,6 +19736,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/coherence_upnp/Makefile.in
+++ b/src/plugins/coherence_upnp/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19394,6 +19770,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/dbus-service/Makefile.in
+++ b/src/plugins/dbus-service/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19422,6 +19804,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/galago/Makefile.in
+++ b/src/plugins/galago/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19450,6 +19838,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/gromit/Makefile.in
+++ b/src/plugins/gromit/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19478,6 +19872,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/iplayer/Makefile.in
+++ b/src/plugins/iplayer/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19506,6 +19906,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/jamendo/Makefile.in
+++ b/src/plugins/jamendo/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19534,6 +19940,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/lirc/Makefile.in
+++ b/src/plugins/lirc/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19562,6 +19974,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -167,6 +167,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19588,8 +20006,32 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+@@ -575,7 +580,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -600,7 +605,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
--- a/src/plugins/media-player-keys/Makefile.in
+++ b/src/plugins/media-player-keys/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -130,6 +130,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19618,6 +20060,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/mythtv/Makefile.in
+++ b/src/plugins/mythtv/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19646,6 +20094,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/ontop/Makefile.in
+++ b/src/plugins/ontop/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19674,6 +20128,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/opensubtitles/Makefile.in
+++ b/src/plugins/opensubtitles/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19702,6 +20162,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/properties/Makefile.in
+++ b/src/plugins/properties/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -137,6 +137,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19730,6 +20196,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/publish/Makefile.in
+++ b/src/plugins/publish/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19758,6 +20230,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/pythonconsole/Makefile.in
+++ b/src/plugins/pythonconsole/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19786,6 +20264,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/sample-python/Makefile.in
+++ b/src/plugins/sample-python/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -67,6 +67,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19814,6 +20298,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/sample-vala/Makefile.in
+++ b/src/plugins/sample-vala/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -127,6 +127,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19842,6 +20332,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/screensaver/Makefile.in
+++ b/src/plugins/screensaver/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19870,6 +20366,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/screenshot/Makefile.in
+++ b/src/plugins/screenshot/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -131,6 +131,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19898,6 +20400,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/sidebar-test/Makefile.in
+++ b/src/plugins/sidebar-test/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19926,6 +20434,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/skipto/Makefile.in
+++ b/src/plugins/skipto/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19954,6 +20468,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/thumbnail/Makefile.in
+++ b/src/plugins/thumbnail/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19982,6 +20502,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/totem/Makefile.in
+++ b/src/plugins/totem/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20010,6 +20536,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/tracker/Makefile.in
+++ b/src/plugins/tracker/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20038,6 +20570,12 @@
PKG_CONFIG = @PKG_CONFIG@
--- a/src/plugins/youtube/Makefile.in
+++ b/src/plugins/youtube/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20195,131 +20733,6 @@
echo powerpc-unknown-lynxos${UNAME_RELEASE}
exit ;;
SM[BE]S:UNIX_SV:*:*)
---- /dev/null
-+++ b/config.h.in~
-@@ -0,0 +1,122 @@
-+/* config.h.in. Generated from configure.in by autoheader. */
-+
-+/* Define to build the browser plugin */
-+#undef ENABLE_BROWSER_PLUGINS
-+
-+/* Whether we can and want to do installation of missing plugins */
-+#undef ENABLE_MISSING_PLUGIN_INSTALLATION
-+
-+/* always defined to indicate that i18n is enabled */
-+#undef ENABLE_NLS
-+
-+/* Define to compile with python plugin support */
-+#undef ENABLE_PYTHON
-+
-+/* Define to the Gettext package name */
-+#undef GETTEXT_PACKAGE
-+
-+/* Enable additional debugging at the expense of performance and size */
-+#undef GNOME_ENABLE_DEBUG
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-+
-+/* Define to 1 if you have the `dcgettext' function. */
-+#undef HAVE_DCGETTEXT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#undef HAVE_GETTEXT
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+#undef HAVE_LC_MESSAGES
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* defined if you build the nautilus plugin */
-+#undef HAVE_NAUTILUS
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* defined if you have X11/XF86keysym.h */
-+#undef HAVE_XFREE
-+
-+/* defined if you have XTest library */
-+#undef HAVE_XTEST
-+
-+/* Define this if you have the XVidMode and XRandR extension installed */
-+#undef HAVE_XVIDMODE
-+
-+/* ISO codes prefix */
-+#undef ISO_CODES_PREFIX
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+ */
-+#undef LT_OBJDIR
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* enable search for UI files and plugins in local directory */
-+#undef TOTEM_RUN_IN_SOURCE_TREE
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define if D-BUS is enabled */
-+#undef WITH_DBUS
-+
-+/* Define if smclient is enabled */
-+#undef WITH_SMCLIENT
--- a/config.sub
+++ b/config.sub
@@ -1,10 +1,10 @@
@@ -20374,3 +20787,201 @@
vendor=ibm
;;
-beos*)
+--- a/INSTALL
++++ b/INSTALL
+@@ -4,8 +4,10 @@
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+- This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
+
+ Basic Installation
+ ==================
+@@ -13,7 +15,11 @@
+ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+@@ -42,7 +48,7 @@
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -67,8 +83,15 @@
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+- 6. Often, you can also type `make uninstall' to remove the installed
+- files again.
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
+
+ Compilers and Options
+ =====================
+@@ -93,7 +116,8 @@
+ own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory. After you have
+@@ -120,7 +144,8 @@
+ By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc. You
+ can specify an installation prefix other than `/usr/local' by giving
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+@@ -131,15 +156,46 @@
+ In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
+ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+@@ -152,6 +208,13 @@
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
+ Particular systems
+ ==================
+
+@@ -288,7 +351,7 @@
+ `configure' can determine that directory automatically.
+
+ `--prefix=DIR'
+- Use DIR as the installation prefix. *Note Installation Names::
++ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+--- a/compile
++++ b/compile
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # Wrapper for compilers which do not understand `-c -o'.
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2009-10-06.20; # UTC
+
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+ # Foundation, Inc.
+@@ -124,9 +124,9 @@
+ ret=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+ elif test -f "${cofile}bj"; then
+- mv "${cofile}bj" "$ofile"
++ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+ fi
+
+ rmdir "$lockdir"
Modified: desktop/unstable/totem/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/series?rev=23185&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/series [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/series [utf-8] Thu Mar 4 09:09:26 2010
@@ -1,3 +1,4 @@
01_fake_keypresses.patch
+02_python2.6.patch
70_bbc_plugin.patch
90_autotools.patch
More information about the pkg-gnome-commits
mailing list