r24685 - in /desktop/unstable/gnome-games/debian: changelog control gnome-games-data.install patches/03_missing_icons.patch patches/11_python2.5.patch patches/90_automake_autoconf.patch patches/series scores.png source/include-binaries

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Jul 4 10:37:09 UTC 2010


Author: joss
Date: Sun Jul  4 10:36:56 2010
New Revision: 24685

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24685
Log:
* New upstream release.
* 11_python2.5.patch: dropped, merged upstream.
* 90_automake_autoconf.patch: regenerated for the new version.
* Fix missing icons. Closes: #587980.
  + 03_missing_icons.patch: new patch. Replace the “pause” and 
    “resume” icons by GTK_STOCK_MEDIA_*, take “scores” from the 
    private directory.
  + scores.png: stolen from gnome-icon-theme 2.28.0.
  + Install it.

Added:
    desktop/unstable/gnome-games/debian/patches/03_missing_icons.patch
    desktop/unstable/gnome-games/debian/scores.png   (with props)
    desktop/unstable/gnome-games/debian/source/include-binaries
Removed:
    desktop/unstable/gnome-games/debian/patches/11_python2.5.patch
Modified:
    desktop/unstable/gnome-games/debian/changelog
    desktop/unstable/gnome-games/debian/control
    desktop/unstable/gnome-games/debian/gnome-games-data.install
    desktop/unstable/gnome-games/debian/patches/90_automake_autoconf.patch
    desktop/unstable/gnome-games/debian/patches/series

Modified: desktop/unstable/gnome-games/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/changelog?rev=24685&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/changelog [utf-8] Sun Jul  4 10:36:56 2010
@@ -1,10 +1,22 @@
-gnome-games (1:2.30.1-2) UNRELEASED; urgency=low
-
+gnome-games (1:2.30.2-1) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
   * debian/patches/01_string_exceptions.patch:
     - Backported from upstream, don't use string exceptions, they are not
       supported in Python 2.6. Closes: #585227.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 14 Jun 2010 13:15:27 +0200
+  [ Josselin Mouette ]
+  * New upstream release.
+  * 11_python2.5.patch: dropped, merged upstream.
+  * 90_automake_autoconf.patch: regenerated for the new version.
+  * Fix missing icons. Closes: #587980.
+    + 03_missing_icons.patch: new patch. Replace the “pause” and 
+      “resume” icons by GTK_STOCK_MEDIA_*, take “scores” from the 
+      private directory.
+    + scores.png: stolen from gnome-icon-theme 2.28.0.
+    + Install it.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 04 Jul 2010 11:55:41 +0200
 
 gnome-games (1:2.30.1-1) unstable; urgency=low
 

Modified: desktop/unstable/gnome-games/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/control?rev=24685&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/control [utf-8] Sun Jul  4 10:36:56 2010
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
                gnome-pkg-tools (>= 0.6),

Modified: desktop/unstable/gnome-games/debian/gnome-games-data.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/gnome-games-data.install?rev=24685&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/gnome-games-data.install [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/gnome-games-data.install [utf-8] Sun Jul  4 10:36:56 2010
@@ -3,3 +3,4 @@
 debian/tmp/usr/share/gnome-games/icons
 debian/tmp/etc/gconf
 debian/tmp/usr/lib/python*
+debian/scores.png /usr/share/gnome-games/icons/hicolor/24x24/actions

Added: desktop/unstable/gnome-games/debian/patches/03_missing_icons.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/03_missing_icons.patch?rev=24685&op=file
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/03_missing_icons.patch (added)
+++ desktop/unstable/gnome-games/debian/patches/03_missing_icons.patch [utf-8] Sun Jul  4 10:36:56 2010
@@ -1,0 +1,38 @@
+Index: gnome-games-2.30.2/libgames-support/games-stock.c
+===================================================================
+--- gnome-games-2.30.2.orig/libgames-support/games-stock.c	2010-07-04 11:33:16.880062363 +0200
++++ gnome-games-2.30.2/libgames-support/games-stock.c	2010-07-04 12:23:59.035567621 +0200
+@@ -282,15 +282,14 @@ games_stock_init (void)
+ #ifdef HAVE_GTK_ICON_FACTORY_ADD_ALIAS
+     { GAMES_STOCK_REDO_MOVE,        GTK_STOCK_REDO },
+     { GAMES_STOCK_UNDO_MOVE,        GTK_STOCK_UNDO },
++    { GAMES_STOCK_RESUME_GAME,      GTK_STOCK_MEDIA_PLAY },
+ #endif
+ #ifndef HAVE_HILDON
+     { GAMES_STOCK_NETWORK_GAME,     GTK_STOCK_NETWORK },
+     { GAMES_STOCK_NETWORK_LEAVE,    GTK_STOCK_STOP },
+     { GAMES_STOCK_PLAYER_LIST,      GTK_STOCK_INFO },
+ 
+-    { GAMES_STOCK_PAUSE_GAME,       "stock_timer_stopped" },
+-    { GAMES_STOCK_RESUME_GAME,      "stock_timer" },
+-    { GAMES_STOCK_SCORES,           "stock_scores" },
++    { GAMES_STOCK_PAUSE_GAME,       GTK_STOCK_MEDIA_PAUSE },
+ #endif /* !HAVE_HILDON */
+   };
+ 
+@@ -298,6 +297,7 @@ games_stock_init (void)
+   const char *stock_icon_aliases_bidi[][3] = {
+     { GAMES_STOCK_REDO_MOVE, GTK_STOCK_REDO "-ltr", GTK_STOCK_REDO "-rtl" },
+     { GAMES_STOCK_UNDO_MOVE, GTK_STOCK_UNDO "-ltr", GTK_STOCK_UNDO "-rtl" },
++    { GAMES_STOCK_RESUME_GAME, GTK_STOCK_MEDIA_PLAY "-ltr", GTK_STOCK_MEDIA_PLAY "-rtl" },
+   };
+ #endif
+ 
+@@ -306,6 +306,7 @@ games_stock_init (void)
+ #ifndef HAVE_HILDON
+     { GAMES_STOCK_TELEPORT, "teleport" },
+     { GAMES_STOCK_RTELEPORT, "teleport-random" },
++    { GAMES_STOCK_SCORES, "scores" },
+ #endif /* !HAVE_HILDON */
+     { GAMES_STOCK_DEAL_CARDS, "cards-deal" }
+   };

Modified: desktop/unstable/gnome-games/debian/patches/90_automake_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/90_automake_autoconf.patch?rev=24685&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/90_automake_autoconf.patch [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/patches/90_automake_autoconf.patch [utf-8] Sun Jul  4 10:36:56 2010
@@ -4,44 +4,245 @@
 autoconf
 rm -rf autom4te.cache
 
-Index: gnome-games-2.30.1/configure
-===================================================================
---- gnome-games-2.30.1.orig/configure	2010-04-27 01:20:38.000000000 +0200
-+++ gnome-games-2.30.1/configure	2010-05-05 21:29:22.583333977 +0200
-@@ -1162,6 +1162,8 @@ CANBERRA_GTK_CFLAGS
- CANBERRA_GTK_LIBS
- SMCLIENT_CFLAGS
- SMCLIENT_LIBS
-+GGZ_GTK_CFLAGS
-+GGZ_GTK_LIBS
- GUILE
- GUILE_CONFIG'
- 
-@@ -1914,6 +1916,10 @@ Some influential environment variables:
-               C compiler flags for SMCLIENT, overriding pkg-config
-   SMCLIENT_LIBS
-               linker flags for SMCLIENT, overriding pkg-config
-+  GGZ_GTK_CFLAGS
-+              C compiler flags for GGZ_GTK, overriding pkg-config
-+  GGZ_GTK_LIBS
-+              linker flags for GGZ_GTK, overriding pkg-config
-   GUILE       path to guile
-   GUILE_CONFIG
-               path to guile-config
-@@ -13922,6 +13928,9 @@ linux*)
-       postdeps_CXX='-library=Cstd -library=Crun'
-     fi
+Index: gnome-games-2.30.2/configure
+===================================================================
+--- gnome-games-2.30.2.orig/configure	2010-06-22 02:08:17.000000000 +0200
++++ gnome-games-2.30.2/configure	2010-07-04 11:32:08.967556115 +0200
+@@ -974,6 +974,8 @@ CPPFLAGS
+ LDFLAGS
+ CFLAGS
+ CC
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ BUILD_SWELL_FOOP_FALSE
+ BUILD_SWELL_FOOP_TRUE
+@@ -1130,6 +1132,8 @@ enable_introspection
+ host_alias
+ target_alias
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ CC
+ CFLAGS
+ LDFLAGS
+@@ -1866,6 +1870,10 @@ Optional Packages:
+ 
+ Some influential environment variables:
+   PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              path overriding pkg-config's built-in search path
+   CC          C compiler command
+   CFLAGS      C compiler flags
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+@@ -3741,6 +3749,10 @@ fi
+ 
+ 
+ 
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -3853,7 +3865,6 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+-
+ fi
+ 
+ ac_ext=c
+@@ -6281,13 +6292,13 @@ if test "${lt_cv_nm_interface+set}" = se
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:6284: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:6295: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6287: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:6298: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:6290: output\"" >&5)
++  (eval echo "\"\$as_me:6301: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+@@ -6742,11 +6753,11 @@ irix5* | irix6* | nonstopux*)
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -7482,7 +7493,7 @@ ia64-*-hpux*)
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 7485 "configure"' > conftest.$ac_ext
++  echo '#line 7496 "configure"' > conftest.$ac_ext
+   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -9401,11 +9412,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9404: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9415: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9408: \$? = $ac_status" >&5
++   echo "$as_me:9419: \$? = $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.
+@@ -9570,7 +9581,7 @@ $as_echo_n "checking for $compiler optio
+       lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -9740,11 +9751,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9743: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9754: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:9747: \$? = $ac_status" >&5
++   echo "$as_me:9758: \$? = $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.
+@@ -9845,11 +9856,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9848: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9859: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9852: \$? = $ac_status" >&5
++   echo "$as_me:9863: \$? = $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
+@@ -9900,11 +9911,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:9903: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9914: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:9907: \$? = $ac_status" >&5
++   echo "$as_me:9918: \$? = $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
+@@ -10019,6 +10030,9 @@ $as_echo_n "checking whether the $compil
+   openbsd*)
+     with_gnu_ld=no
      ;;
 +  linux* | k*bsd*-gnu)
 +    link_all_deplibs=no
 +    ;;
    esac
+ 
+   ld_shlibs=yes
+@@ -10040,6 +10054,7 @@ $as_echo_n "checking whether the $compil
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
+       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -10131,7 +10146,7 @@ _LT_EOF
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -10201,7 +10216,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -10376,6 +10391,7 @@ _LT_EOF
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	link_all_deplibs=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -10702,7 +10718,7 @@ rm -f core conftest.err conftest.$ac_obj
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11592,7 +11608,7 @@ linux*oldld* | linux*aout* | linux*coff*
    ;;
  
-@@ -15121,6 +15130,18 @@ rm -f core conftest.err conftest.$ac_obj
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -11632,13 +11648,10 @@ rm -f core conftest.err conftest.$ac_obj
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11650,6 +11663,18 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
    ;;
  
- netbsdelf*-gnu)
++netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
@@ -53,7 +254,1956 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+netbsdelf*-gnu)
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -12270,7 +12295,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12273 "configure"
++#line 12298 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -12366,7 +12391,7 @@ else
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 12369 "configure"
++#line 12394 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -13306,7 +13331,7 @@ if test -z "$aix_libpath"; then aix_libp
+         inherit_rpath_CXX=yes
+         ;;
+ 
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -14134,7 +14159,7 @@ $as_echo_n "checking for $compiler optio
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -14198,7 +14223,7 @@ $as_echo_n "checking for $compiler optio
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -14322,11 +14347,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14325: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14329: \$? = $ac_status" >&5
++   echo "$as_me:14354: \$? = $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.
+@@ -14421,11 +14446,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14424: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14449: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14428: \$? = $ac_status" >&5
++   echo "$as_me:14453: \$? = $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
+@@ -14473,11 +14498,11 @@ else
+    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+    -e 's:$: $lt_compiler_flag:'`
+-   (eval echo "\"\$as_me:14476: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14501: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14480: \$? = $ac_status" >&5
++   echo "$as_me:14505: \$? = $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
+@@ -14549,6 +14574,9 @@ $as_echo_n "checking whether the $compil
+   cygwin* | mingw* | cegcc*)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux* | k*bsd*-gnu)
++    link_all_deplibs_CXX=no
++  ;;
+   *)
+     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -15048,7 +15076,7 @@ linux*oldld* | linux*aout* | linux*coff*
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
+@@ -15088,13 +15116,10 @@ rm -f core conftest.err conftest.$ac_obj
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -15106,6 +15131,18 @@ rm -f core conftest.err conftest.$ac_obj
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -16475,6 +16512,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -16498,9 +16537,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables GTHREAD_CFLAGS
+ and GTHREAD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -16518,7 +16558,7 @@ else
+ 	GTHREAD_LIBS=$pkg_cv_GTHREAD_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -16564,6 +16604,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -16587,9 +16629,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables GTK_CFLAGS
+ and GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -16607,7 +16650,7 @@ else
+ 	GTK_LIBS=$pkg_cv_GTK_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -16747,6 +16790,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -16770,9 +16815,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables GNOME_CFLAGS
+ and GNOME_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -16790,7 +16836,7 @@ else
+ 	GNOME_LIBS=$pkg_cv_GNOME_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -16855,6 +16901,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -16884,9 +16932,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables HILDON_CFLAGS
+ and HILDON_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -16904,7 +16953,7 @@ else
+ 	HILDON_LIBS=$pkg_cv_HILDON_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+   else
+ 
+@@ -16966,6 +17015,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -16998,9 +17049,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables HILDON_CFLAGS
+ and HILDON_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17018,7 +17070,7 @@ else
+ 	HILDON_LIBS=$pkg_cv_HILDON_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+   fi
+ 
+@@ -17086,6 +17138,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17115,9 +17169,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables RSVG_CFLAGS
+ and RSVG_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17135,7 +17190,7 @@ else
+ 	RSVG_LIBS=$pkg_cv_RSVG_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -17211,6 +17266,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17234,9 +17291,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables CLUTTER_CFLAGS
+ and CLUTTER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17254,7 +17312,7 @@ else
+ 	CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -17300,6 +17358,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17314,8 +17374,6 @@ fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CLUTTER_GTK_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5
+@@ -17357,6 +17415,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17380,9 +17440,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables CLUTTER_GTK_CFLAGS
+ and CLUTTER_GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17400,9 +17461,11 @@ else
+ 	CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER_GTK" >&5
+@@ -17444,6 +17507,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17467,9 +17532,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables CLUTTER_GTK_CFLAGS
+ and CLUTTER_GTK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17487,14 +17553,14 @@ else
+ 	CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ else
+ 	CLUTTER_GTK_CFLAGS=$pkg_cv_CLUTTER_GTK_CFLAGS
+ 	CLUTTER_GTK_LIBS=$pkg_cv_CLUTTER_GTK_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -17553,6 +17619,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17576,9 +17644,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables DBUS_GLIB_CFLAGS
+ and DBUS_GLIB_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17596,7 +17665,7 @@ else
+ 	DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -17652,6 +17721,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17668,10 +17739,10 @@ fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PYGTK_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                have_pygtk=no
++	have_pygtk=no
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	have_pygtk=no
+ else
+ 	PYGTK_CFLAGS=$pkg_cv_PYGTK_CFLAGS
+@@ -17758,6 +17829,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17772,17 +17845,17 @@ fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CANBERRA_GTK_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-                as_fn_error "Sound support was requested, but libcanberra-gtk not found." "$LINENO" 5
++	as_fn_error "Sound support was requested, but libcanberra-gtk not found." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	as_fn_error "Sound support was requested, but libcanberra-gtk not found." "$LINENO" 5
+ else
+ 	CANBERRA_GTK_CFLAGS=$pkg_cv_CANBERRA_GTK_CFLAGS
+ 	CANBERRA_GTK_LIBS=$pkg_cv_CANBERRA_GTK_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+ 
+ 
+@@ -17814,7 +17887,7 @@ if test "${with_smclient+set}" = set; th
+ else
+   case "$with_platform" in
+        gnome|gtk-only) case "$GDK_TARGET" in
+-                         x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
++                         x11) with_smclient=xsmp SMCLIENT_PKGS="sm ice" ;;
+                          win32|quartz) with_smclient=$GDK_TARGET ;;
+                          *) with_smclient=no ;;
+                        esac
+@@ -17869,6 +17942,8 @@ fi
+ 
+ 
+ if test $pkg_failed = yes; then
++   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+         _pkg_short_errors_supported=yes
+@@ -17892,9 +17967,10 @@ installed software in a non-standard pre
+ 
+ Alternatively, you may set the environment variables SMCLIENT_CFLAGS
+ and SMCLIENT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" "$LINENO" 5
++See the pkg-config man page for more details." "$LINENO" 5
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+@@ -17912,7 +17988,7 @@ else
+ 	SMCLIENT_LIBS=$pkg_cv_SMCLIENT_LIBS
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-	:
++
+ fi
+     fi
+ 
+Index: gnome-games-2.30.2/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/Makefile.in	2010-07-04 11:32:10.803559513 +0200
++++ gnome-games-2.30.2/Makefile.in	2010-07-04 11:32:07.927560737 +0200
+@@ -234,6 +234,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/aclocal.m4
+===================================================================
+--- gnome-games-2.30.2.orig/aclocal.m4	2010-07-04 11:32:11.099562702 +0200
++++ gnome-games-2.30.2/aclocal.m4	2010-07-04 11:31:55.892061745 +0200
+@@ -724,6 +724,7 @@ AC_DEFUN([AM_NLS],
+ ])
+ 
+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ # 
+ # Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
+ #
+@@ -751,7 +752,10 @@ AC_DEFUN([AM_NLS],
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -764,7 +768,6 @@ if test -n "$PKG_CONFIG"; then
+ 		AC_MSG_RESULT([no])
+ 		PKG_CONFIG=""
+ 	fi
+-		
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+ 
+@@ -773,21 +776,20 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists.  Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+-  m4_ifval([$2], [$2], [:])
++  m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+   $3])dnl
+ fi])
+ 
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+@@ -840,6 +842,7 @@ and $1[]_LIBS to avoid the need to call
+ See the pkg-config man page for more details.])
+ 
+ if test $pkg_failed = yes; then
++   	AC_MSG_RESULT([no])
+         _PKG_SHORT_ERRORS_SUPPORTED
+         if test $_pkg_short_errors_supported = yes; then
+ 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+@@ -849,7 +852,7 @@ if test $pkg_failed = yes; then
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ 
+-	ifelse([$4], , [AC_MSG_ERROR(dnl
++	m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+ 
+ $$1_PKG_ERRORS
+@@ -857,25 +860,24 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT
+-])],
+-		[AC_MSG_RESULT([no])
+-                $4])
++_PKG_TEXT])dnl
++        ])
+ elif test $pkg_failed = untried; then
+-	ifelse([$4], , [AC_MSG_FAILURE(dnl
++     	AC_MSG_RESULT([no])
++	m4_default([$4], [AC_MSG_FAILURE(
+ [The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+-		[$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++        ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+         AC_MSG_RESULT([yes])
+-	ifelse([$3], , :, [$3])
++	$3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+Index: gnome-games-2.30.2/aisleriot/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/aisleriot/Makefile.in	2010-07-04 11:32:15.668061777 +0200
++++ gnome-games-2.30.2/aisleriot/Makefile.in	2010-07-04 11:31:58.747558963 +0200
+@@ -390,6 +390,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/aisleriot/data/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/aisleriot/data/Makefile.in	2010-07-04 11:32:16.935564547 +0200
++++ gnome-games-2.30.2/aisleriot/data/Makefile.in	2010-07-04 11:31:58.847557769 +0200
+@@ -204,6 +204,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/aisleriot/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/aisleriot/help/Makefile.in	2010-07-04 11:32:16.371565636 +0200
++++ gnome-games-2.30.2/aisleriot/help/Makefile.in	2010-07-04 11:31:58.975559157 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/aisleriot/lib/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/aisleriot/lib/Makefile.in	2010-07-04 11:32:15.768057169 +0200
++++ gnome-games-2.30.2/aisleriot/lib/Makefile.in	2010-07-04 11:31:59.183558929 +0200
+@@ -286,6 +286,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/aisleriot/rules/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/aisleriot/rules/Makefile.in	2010-07-04 11:32:15.943564379 +0200
++++ gnome-games-2.30.2/aisleriot/rules/Makefile.in	2010-07-04 11:31:59.279557163 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/config.guess
+===================================================================
+--- gnome-games-2.30.2.orig/config.guess	2010-07-04 11:32:10.999566820 +0200
++++ gnome-games-2.30.2/config.guess	2010-07-04 11:31:58.079560646 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-11-20'
++timestamp='2009-12-30'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+Index: gnome-games-2.30.2/config.sub
+===================================================================
+--- gnome-games-2.30.2.orig/config.sub	2010-07-04 11:32:10.907559382 +0200
++++ gnome-games-2.30.2/config.sub	2010-07-04 11:31:58.107558830 +0200
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-11-20'
++timestamp='2010-01-22'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -75,8 +75,9 @@ Report bugs and patches to <config-patch
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -380,7 +381,8 @@ case $basic_machine in
+ 	| sparclite-* \
+ 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
+ 	| tron-* \
+ 	| ubicom32-* \
+ 	| v850-* | v850e-* | vax-* \
+@@ -1085,6 +1087,11 @@ case $basic_machine in
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
+ 	tile*)
+ 		basic_machine=tile-unknown
+ 		os=-linux-gnu
+@@ -1435,6 +1442,8 @@ case $os in
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++        -nacl*)
++	        ;;
+ 	-none)
+ 		;;
+ 	*)
+Index: gnome-games-2.30.2/glchess/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/Makefile.in	2010-07-04 11:32:20.988058444 +0200
++++ gnome-games-2.30.2/glchess/Makefile.in	2010-07-04 11:31:59.383558010 +0200
+@@ -240,6 +240,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/data/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/data/Makefile.in	2010-07-04 11:32:22.068061072 +0200
++++ gnome-games-2.30.2/glchess/data/Makefile.in	2010-07-04 11:31:59.487558379 +0200
+@@ -202,6 +202,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/gnuchess/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/gnuchess/Makefile.in	2010-07-04 11:32:21.936058606 +0200
++++ gnome-games-2.30.2/glchess/gnuchess/Makefile.in	2010-07-04 11:31:59.759557625 +0200
+@@ -229,6 +229,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/help/Makefile.in	2010-07-04 11:32:21.100061439 +0200
++++ gnome-games-2.30.2/glchess/help/Makefile.in	2010-07-04 11:31:59.887560474 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/Makefile.in	2010-07-04 11:32:21.312061291 +0200
++++ gnome-games-2.30.2/glchess/src/Makefile.in	2010-07-04 11:31:59.987557820 +0200
+@@ -239,6 +239,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/Makefile.in	2010-07-04 11:32:21.372059693 +0200
++++ gnome-games-2.30.2/glchess/src/lib/Makefile.in	2010-07-04 11:32:00.132059712 +0200
+@@ -238,6 +238,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/chess/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/chess/Makefile.in	2010-07-04 11:32:21.492060419 +0200
++++ gnome-games-2.30.2/glchess/src/lib/chess/Makefile.in	2010-07-04 11:32:00.264058755 +0200
+@@ -238,6 +238,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/chess/fics/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/chess/fics/Makefile.in	2010-07-04 11:32:21.548061183 +0200
++++ gnome-games-2.30.2/glchess/src/lib/chess/fics/Makefile.in	2010-07-04 11:32:00.368060581 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/ggz/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/ggz/Makefile.in	2010-07-04 11:32:21.872058156 +0200
++++ gnome-games-2.30.2/glchess/src/lib/ggz/Makefile.in	2010-07-04 11:32:00.468057926 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/gtkui/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/gtkui/Makefile.in	2010-07-04 11:32:21.808058688 +0200
++++ gnome-games-2.30.2/glchess/src/lib/gtkui/Makefile.in	2010-07-04 11:32:00.568059675 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/scene/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/scene/Makefile.in	2010-07-04 11:32:21.628059065 +0200
++++ gnome-games-2.30.2/glchess/src/lib/scene/Makefile.in	2010-07-04 11:32:00.672059562 +0200
+@@ -238,6 +238,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/scene/cairo/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/scene/cairo/Makefile.in	2010-07-04 11:32:21.740059617 +0200
++++ gnome-games-2.30.2/glchess/src/lib/scene/cairo/Makefile.in	2010-07-04 11:32:00.768057797 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/scene/opengl/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/scene/opengl/Makefile.in	2010-07-04 11:32:21.676061607 +0200
++++ gnome-games-2.30.2/glchess/src/lib/scene/opengl/Makefile.in	2010-07-04 11:32:00.868059045 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/src/lib/ui/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/src/lib/ui/Makefile.in	2010-07-04 11:32:21.428058986 +0200
++++ gnome-games-2.30.2/glchess/src/lib/ui/Makefile.in	2010-07-04 11:32:00.968057856 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glchess/textures/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glchess/textures/Makefile.in	2010-07-04 11:32:21.036061473 +0200
++++ gnome-games-2.30.2/glchess/textures/Makefile.in	2010-07-04 11:32:01.064057071 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glines/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glines/Makefile.in	2010-07-04 11:32:14.628061998 +0200
++++ gnome-games-2.30.2/glines/Makefile.in	2010-07-04 11:32:01.216058521 +0200
+@@ -292,6 +292,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/glines/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/glines/help/Makefile.in	2010-07-04 11:32:14.716069836 +0200
++++ gnome-games-2.30.2/glines/help/Makefile.in	2010-07-04 11:32:01.348057553 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnect/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnect/Makefile.in	2010-07-04 11:32:18.804059019 +0200
++++ gnome-games-2.30.2/gnect/Makefile.in	2010-07-04 11:32:01.444059204 +0200
+@@ -215,6 +215,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnect/data/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnect/data/Makefile.in	2010-07-04 11:32:19.216059429 +0200
++++ gnome-games-2.30.2/gnect/data/Makefile.in	2010-07-04 11:32:01.556058289 +0200
+@@ -203,6 +203,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnect/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnect/help/Makefile.in	2010-07-04 11:32:18.856062620 +0200
++++ gnome-games-2.30.2/gnect/help/Makefile.in	2010-07-04 11:32:01.684057736 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnect/pixmaps/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnect/pixmaps/Makefile.in	2010-07-04 11:32:19.148060840 +0200
++++ gnome-games-2.30.2/gnect/pixmaps/Makefile.in	2010-07-04 11:32:01.780058903 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnect/src/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnect/src/Makefile.in	2010-07-04 11:32:19.044058021 +0200
++++ gnome-games-2.30.2/gnect/src/Makefile.in	2010-07-04 11:32:01.968062117 +0200
+@@ -228,6 +228,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnibbles/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnibbles/Makefile.in	2010-07-04 11:32:22.252059815 +0200
++++ gnome-games-2.30.2/gnibbles/Makefile.in	2010-07-04 11:32:02.180058065 +0200
+@@ -298,6 +298,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnibbles/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnibbles/help/Makefile.in	2010-07-04 11:32:22.460059562 +0200
++++ gnome-games-2.30.2/gnibbles/help/Makefile.in	2010-07-04 11:32:02.312058079 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnibbles/pix/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnibbles/pix/Makefile.in	2010-07-04 11:32:22.328058575 +0200
++++ gnome-games-2.30.2/gnibbles/pix/Makefile.in	2010-07-04 11:32:02.412059816 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnobots2/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnobots2/Makefile.in	2010-07-04 11:32:19.832059501 +0200
++++ gnome-games-2.30.2/gnobots2/Makefile.in	2010-07-04 11:32:02.620059095 +0200
+@@ -300,6 +300,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnobots2/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnobots2/help/Makefile.in	2010-07-04 11:32:19.916058928 +0200
++++ gnome-games-2.30.2/gnobots2/help/Makefile.in	2010-07-04 11:32:02.748058538 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/Makefile.in	2010-07-04 11:32:13.371561654 +0200
++++ gnome-games-2.30.2/gnome-sudoku/Makefile.in	2010-07-04 11:32:02.852058409 +0200
+@@ -239,6 +239,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/data/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/data/Makefile.in	2010-07-04 11:32:14.488060818 +0200
++++ gnome-games-2.30.2/gnome-sudoku/data/Makefile.in	2010-07-04 11:32:02.960058375 +0200
+@@ -202,6 +202,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/help/Makefile.in	2010-07-04 11:32:13.564059723 +0200
++++ gnome-games-2.30.2/gnome-sudoku/help/Makefile.in	2010-07-04 11:32:03.088057817 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/images/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/images/Makefile.in	2010-07-04 11:32:13.464060908 +0200
++++ gnome-games-2.30.2/gnome-sudoku/images/Makefile.in	2010-07-04 11:32:03.188058105 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/src/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/src/Makefile.in	2010-07-04 11:32:14.096063305 +0200
++++ gnome-games-2.30.2/gnome-sudoku/src/Makefile.in	2010-07-04 11:32:03.288056916 +0200
+@@ -239,6 +239,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/src/lib/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/src/lib/Makefile.in	2010-07-04 11:32:14.192064969 +0200
++++ gnome-games-2.30.2/gnome-sudoku/src/lib/Makefile.in	2010-07-04 11:32:03.396057853 +0200
+@@ -238,6 +238,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnome-sudoku/src/lib/gtk_goodies/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnome-sudoku/src/lib/gtk_goodies/Makefile.in	2010-07-04 11:32:14.296057513 +0200
++++ gnome-games-2.30.2/gnome-sudoku/src/lib/gtk_goodies/Makefile.in	2010-07-04 11:32:03.500058712 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnomine/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnomine/Makefile.in	2010-07-04 11:32:20.096060022 +0200
++++ gnome-games-2.30.2/gnomine/Makefile.in	2010-07-04 11:32:03.656058785 +0200
+@@ -291,6 +291,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnomine/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnomine/help/Makefile.in	2010-07-04 11:32:20.156062347 +0200
++++ gnome-games-2.30.2/gnomine/help/Makefile.in	2010-07-04 11:32:03.784058712 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnotravex/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnotravex/Makefile.in	2010-07-04 11:32:17.235563444 +0200
++++ gnome-games-2.30.2/gnotravex/Makefile.in	2010-07-04 11:32:03.936060143 +0200
+@@ -291,6 +291,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnotravex/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnotravex/help/Makefile.in	2010-07-04 11:32:17.328064162 +0200
++++ gnome-games-2.30.2/gnotravex/help/Makefile.in	2010-07-04 11:32:04.063558474 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnotravex/pixmaps/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnotravex/pixmaps/Makefile.in	2010-07-04 11:32:18.140063734 +0200
++++ gnome-games-2.30.2/gnotravex/pixmaps/Makefile.in	2010-07-04 11:32:04.188061387 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnotski/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnotski/Makefile.in	2010-07-04 11:32:20.444061439 +0200
++++ gnome-games-2.30.2/gnotski/Makefile.in	2010-07-04 11:32:04.343558378 +0200
+@@ -292,6 +292,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gnotski/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gnotski/help/Makefile.in	2010-07-04 11:32:20.504057894 +0200
++++ gnome-games-2.30.2/gnotski/help/Makefile.in	2010-07-04 11:32:04.504058173 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gtali/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gtali/Makefile.in	2010-07-04 11:32:11.587564318 +0200
++++ gnome-games-2.30.2/gtali/Makefile.in	2010-07-04 11:32:04.679560516 +0200
+@@ -292,6 +292,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gtali/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gtali/help/Makefile.in	2010-07-04 11:32:11.827561864 +0200
++++ gnome-games-2.30.2/gtali/help/Makefile.in	2010-07-04 11:32:04.807558485 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/gtali/pix/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/gtali/pix/Makefile.in	2010-07-04 11:32:11.675564826 +0200
++++ gnome-games-2.30.2/gtali/pix/Makefile.in	2010-07-04 11:32:04.903556221 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/iagno/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/iagno/Makefile.in	2010-07-04 11:32:12.727562916 +0200
++++ gnome-games-2.30.2/iagno/Makefile.in	2010-07-04 11:32:05.063558822 +0200
+@@ -293,6 +293,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/iagno/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/iagno/help/Makefile.in	2010-07-04 11:32:12.811563812 +0200
++++ gnome-games-2.30.2/iagno/help/Makefile.in	2010-07-04 11:32:05.191560714 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/icons/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/icons/Makefile.in	2010-07-04 11:32:12.199564804 +0200
++++ gnome-games-2.30.2/icons/Makefile.in	2010-07-04 11:32:05.315558104 +0200
+@@ -446,6 +446,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/libgames-support/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/libgames-support/Makefile.in	2010-07-04 11:32:11.280058065 +0200
++++ gnome-games-2.30.2/libgames-support/Makefile.in	2010-07-04 11:32:05.743558385 +0200
+@@ -435,6 +435,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/lightsoff/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/lightsoff/Makefile.in	2010-07-04 11:32:18.236059527 +0200
++++ gnome-games-2.30.2/lightsoff/Makefile.in	2010-07-04 11:32:05.855556968 +0200
+@@ -241,6 +241,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/lightsoff/data/themes/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/lightsoff/data/themes/Makefile.in	2010-07-04 11:32:18.408061892 +0200
++++ gnome-games-2.30.2/lightsoff/data/themes/Makefile.in	2010-07-04 11:32:05.951557642 +0200
+@@ -214,6 +214,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/lightsoff/data/themes/tango/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/lightsoff/data/themes/tango/Makefile.in	2010-07-04 11:32:18.456059054 +0200
++++ gnome-games-2.30.2/lightsoff/data/themes/tango/Makefile.in	2010-07-04 11:32:06.047558813 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/lightsoff/data/themes/up/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/lightsoff/data/themes/up/Makefile.in	2010-07-04 11:32:18.516062842 +0200
++++ gnome-games-2.30.2/lightsoff/data/themes/up/Makefile.in	2010-07-04 11:32:06.143558032 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/lightsoff/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/lightsoff/help/Makefile.in	2010-07-04 11:32:18.276060909 +0200
++++ gnome-games-2.30.2/lightsoff/help/Makefile.in	2010-07-04 11:32:06.267557872 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/lightsoff/src/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/lightsoff/src/Makefile.in	2010-07-04 11:32:18.336059312 +0200
++++ gnome-games-2.30.2/lightsoff/src/Makefile.in	2010-07-04 11:32:06.367558632 +0200
+@@ -200,6 +200,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/ltmain.sh
+===================================================================
+--- gnome-games-2.30.2.orig/ltmain.sh	2010-07-04 11:32:11.187560765 +0200
++++ gnome-games-2.30.2/ltmain.sh	2010-07-04 11:31:46.319561817 +0200
+@@ -65,7 +65,7 @@
+ #       compiler:		$LTCC
+ #       compiler flags:		$LTCFLAGS
+ #       linker:		$LD (gnu? $with_gnu_ld)
+-#       $progname:		(GNU libtool) 2.2.6b
++#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
+ #       automake:		$automake_version
+ #       autoconf:		$autoconf_version
+ #
+@@ -73,7 +73,7 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=2.2.6b
++VERSION="2.2.6b Debian-2.2.6b-2"
+ TIMESTAMP=""
+ package_revision=1.3017
+ 
+@@ -5033,7 +5033,10 @@ func_mode_link ()
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5344,19 +5347,19 @@ func_mode_link ()
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+ 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
++	    tmp_libs=
++	    for deplib in $dependency_libs; do
++	      deplibs="$deplib $deplibs"
++	      if $opt_duplicate_deps ; then
++		case "$tmp_libs " in
++		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++		esac
++	      fi
++	      tmp_libs="$tmp_libs $deplib"
++	    done
+ 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    func_fatal_error "\`$lib' is not a convenience library"
+ 	  fi
+-	  tmp_libs=
+-	  for deplib in $dependency_libs; do
+-	    deplibs="$deplib $deplibs"
+-	    if $opt_duplicate_deps ; then
+-	      case "$tmp_libs " in
+-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+-	      esac
+-	    fi
+-	    tmp_libs="$tmp_libs $deplib"
+-	  done
+ 	  continue
+ 	fi # $pass = conv
+ 
+@@ -5893,6 +5896,7 @@ func_mode_link ()
+ 	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
++	      path=
+ 	      case $deplib in
+ 	      -L*) path="$deplib" ;;
+ 	      *.la)
+@@ -6206,6 +6210,9 @@ func_mode_link ()
+ 	    revision="$number_minor"
+ 	    lt_irix_increment=no
+ 	    ;;
++	  *)
++	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+Index: gnome-games-2.30.2/m4/libtool.m4
+===================================================================
+--- gnome-games-2.30.2.orig/m4/libtool.m4	2010-07-04 11:32:19.280060858 +0200
++++ gnome-games-2.30.2/m4/libtool.m4	2010-07-04 11:31:46.499561926 +0200
+@@ -2445,7 +2445,7 @@ linux*oldld* | linux*aout* | linux*coff*
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2470,13 +2470,10 @@ linux* | k*bsd*-gnu)
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  # Add ABI-specific directories to the system library path.
+-  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+-
+   # Append ld.so.conf contents to the search path
+   if test -f /etc/ld.so.conf; then
+     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+-    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2488,6 +2485,18 @@ linux* | k*bsd*-gnu)
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -3075,11 +3084,11 @@ irix5* | irix6* | nonstopux*)
+   ;;
+ 
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+@@ -3696,7 +3705,7 @@ m4_if([$1], [CXX], [
+ 	    ;;
+ 	esac
+ 	;;
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -3760,7 +3769,7 @@ m4_if([$1], [CXX], [
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       *qnx* | *nto*)
+         # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -3980,7 +3989,7 @@ m4_if([$1], [CXX], [
+       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+       ;;
+ 
+-    linux* | k*bsd*-gnu)
++    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+       case $cc_basename in
+       # old Intel for x86_64 which still supported -KPIC.
+       ecc*)
+@@ -4185,6 +4194,9 @@ m4_if([$1], [CXX], [
+   cygwin* | mingw* | cegcc*)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++  ;;
+   *)
+     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   ;;
+@@ -4249,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
+   openbsd*)
+     with_gnu_ld=no
+     ;;
++  linux* | k*bsd*-gnu)
++    _LT_TAGVAR(link_all_deplibs, $1)=no
++    ;;
+   esac
+ 
+   _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -4270,6 +4285,7 @@ dnl Note also adjust exclude_expsyms for
+     fi
+     supports_anon_versioning=no
+     case `$LD -v 2>&1` in
++      *GNU\ gold*) supports_anon_versioning=yes ;;
+       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4361,7 +4377,7 @@ _LT_EOF
+       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    gnu* | linux* | tpf* | k*bsd*-gnu)
++    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+       tmp_diet=no
+       if test "$host_os" = linux-dietlibc; then
+ 	case $cc_basename in
+@@ -4431,7 +4447,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -4606,6 +4622,7 @@ _LT_EOF
+ 	if test "$aix_use_runtimelinking" = yes; then
+ 	  shared_flag="$shared_flag "'${wl}-G'
+ 	fi
++	_LT_TAGVAR(link_all_deplibs, $1)=no
+       else
+ 	# not using gcc
+ 	if test "$host_cpu" = ia64; then
+@@ -4844,7 +4861,7 @@ _LT_EOF
+       _LT_TAGVAR(link_all_deplibs, $1)=yes
+       ;;
+ 
+-    netbsd*)
++    netbsd* | netbsdelf*-gnu)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -5844,7 +5861,7 @@ if test "$_lt_caught_CXX_error" != yes;
+         _LT_TAGVAR(inherit_rpath, $1)=yes
+         ;;
+ 
+-      linux* | k*bsd*-gnu)
++      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+         case $cc_basename in
+           KCC*)
+ 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+Index: gnome-games-2.30.2/mahjongg/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/mahjongg/Makefile.in	2010-07-04 11:32:20.684058504 +0200
++++ gnome-games-2.30.2/mahjongg/Makefile.in	2010-07-04 11:32:06.535557986 +0200
+@@ -294,6 +294,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/mahjongg/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/mahjongg/help/Makefile.in	2010-07-04 11:32:20.752060513 +0200
++++ gnome-games-2.30.2/mahjongg/help/Makefile.in	2010-07-04 11:32:06.663557922 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/quadrapassel/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/quadrapassel/Makefile.in	2010-07-04 11:32:15.100059833 +0200
++++ gnome-games-2.30.2/quadrapassel/Makefile.in	2010-07-04 11:32:06.859560829 +0200
+@@ -315,6 +315,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/quadrapassel/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/quadrapassel/help/Makefile.in	2010-07-04 11:32:15.340061775 +0200
++++ gnome-games-2.30.2/quadrapassel/help/Makefile.in	2010-07-04 11:32:06.983557730 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/quadrapassel/pix/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/quadrapassel/pix/Makefile.in	2010-07-04 11:32:15.220062033 +0200
++++ gnome-games-2.30.2/quadrapassel/pix/Makefile.in	2010-07-04 11:32:07.079558412 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/sounds/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/sounds/Makefile.in	2010-07-04 11:32:22.156059134 +0200
++++ gnome-games-2.30.2/sounds/Makefile.in	2010-07-04 11:32:07.175557632 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/swell-foop/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/swell-foop/Makefile.in	2010-07-04 11:32:19.344058861 +0200
++++ gnome-games-2.30.2/swell-foop/Makefile.in	2010-07-04 11:32:07.291559735 +0200
+@@ -243,6 +243,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/swell-foop/data/themes/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/swell-foop/data/themes/Makefile.in	2010-07-04 11:32:19.644058725 +0200
++++ gnome-games-2.30.2/swell-foop/data/themes/Makefile.in	2010-07-04 11:32:07.387557959 +0200
+@@ -214,6 +214,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/swell-foop/data/themes/tango/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/swell-foop/data/themes/tango/Makefile.in	2010-07-04 11:32:19.696063312 +0200
++++ gnome-games-2.30.2/swell-foop/data/themes/tango/Makefile.in	2010-07-04 11:32:07.483560105 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/swell-foop/data/themes/test/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/swell-foop/data/themes/test/Makefile.in	2010-07-04 11:32:19.760062787 +0200
++++ gnome-games-2.30.2/swell-foop/data/themes/test/Makefile.in	2010-07-04 11:32:07.575558252 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/swell-foop/help/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/swell-foop/help/Makefile.in	2010-07-04 11:32:19.400060596 +0200
++++ gnome-games-2.30.2/swell-foop/help/Makefile.in	2010-07-04 11:32:07.703558678 +0200
+@@ -199,6 +199,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+Index: gnome-games-2.30.2/swell-foop/src/Makefile.in
+===================================================================
+--- gnome-games-2.30.2.orig/swell-foop/src/Makefile.in	2010-07-04 11:32:19.580061200 +0200
++++ gnome-games-2.30.2/swell-foop/src/Makefile.in	2010-07-04 11:32:07.799557888 +0200
+@@ -198,6 +198,8 @@ PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@

Modified: desktop/unstable/gnome-games/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/patches/series?rev=24685&op=diff
==============================================================================
--- desktop/unstable/gnome-games/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-games/debian/patches/series [utf-8] Sun Jul  4 10:36:56 2010
@@ -1,6 +1,6 @@
 01_string_exceptions.patch
 02_desktop-path.patch
+03_missing_icons.patch
 10_libice.patch
 #20_glchess_no3d.patch
-11_python2.5.patch
 90_automake_autoconf.patch

Added: desktop/unstable/gnome-games/debian/scores.png
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/scores.png?rev=24685&op=file
==============================================================================
Binary file - no diff available.

Propchange: desktop/unstable/gnome-games/debian/scores.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: desktop/unstable/gnome-games/debian/source/include-binaries
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-games/debian/source/include-binaries?rev=24685&op=file
==============================================================================
--- desktop/unstable/gnome-games/debian/source/include-binaries (added)
+++ desktop/unstable/gnome-games/debian/source/include-binaries [utf-8] Sun Jul  4 10:36:56 2010
@@ -1,0 +1,1 @@
+debian/scores.png




More information about the pkg-gnome-commits mailing list