r19966 - in /desktop/unstable/pango1.0/debian: changelog patches/90_relibtoolize.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Thu May 14 07:39:23 UTC 2009
Author: slomo
Date: Thu May 14 07:39:23 2009
New Revision: 19966
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19966
Log:
* New upstream bugfix release:
+ debian/patches/90_relibtoolize.patch:
- Updated for the new version.
Modified:
desktop/unstable/pango1.0/debian/changelog
desktop/unstable/pango1.0/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/changelog?rev=19966&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/changelog (original)
+++ desktop/unstable/pango1.0/debian/changelog Thu May 14 07:39:23 2009
@@ -1,4 +1,4 @@
-pango1.0 (1.24.1-1) UNRELEASED; urgency=low
+pango1.0 (1.24.2-1) unstable; urgency=low
[ Luca Bruno ]
* New upstream bugfix release:
@@ -10,7 +10,12 @@
[ Josselin Mouette ]
* Add libglib2.0-doc to b-d-i to ensure proper xrefs.
- -- Luca Bruno <lethalman88 at gmail.com> Sat, 02 May 2009 23:58:43 +0200
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/patches/90_relibtoolize.patch:
+ - Updated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Thu, 14 May 2009 09:34:23 +0200
pango1.0 (1.24.0-4) UNRELEASED; urgency=low
Modified: desktop/unstable/pango1.0/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pango1.0/debian/patches/90_relibtoolize.patch?rev=19966&op=diff
==============================================================================
--- desktop/unstable/pango1.0/debian/patches/90_relibtoolize.patch (original)
+++ desktop/unstable/pango1.0/debian/patches/90_relibtoolize.patch Thu May 14 07:39:23 2009
@@ -1,21 +1,6 @@
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/aclocal.m4 pango1.0-1.24.0/aclocal.m4
---- pango1.0-1.24.0.old/aclocal.m4 2009-03-16 23:34:43.000000000 +0100
-+++ pango1.0-1.24.0/aclocal.m4 2009-03-22 14:58:01.000000000 +0100
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-@@ -13,7 +13,7 @@
-
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-+m4_if(AC_AUTOCONF_VERSION, [2.63],,
- [m4_warning([this file was generated for autoconf 2.63.
- You have another version of autoconf. It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
+diff -Naur pango1.0-1.24.2.old/aclocal.m4 pango1.0-1.24.2/aclocal.m4
+--- pango1.0-1.24.2.old/aclocal.m4 2009-05-04 22:05:13.000000000 +0200
++++ pango1.0-1.24.2/aclocal.m4 2009-05-14 09:37:14.000000000 +0200
@@ -2525,13 +2525,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -78,7 +63,17 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -4486,7 +4498,7 @@
+@@ -4304,6 +4316,9 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -4486,7 +4501,7 @@
fi
;;
@@ -87,7 +82,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -4661,6 +4673,7 @@
+@@ -4661,6 +4676,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -95,7 +90,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -4899,7 +4912,7 @@
+@@ -4899,7 +4915,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -104,7 +99,7 @@
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
-@@ -8076,14 +8089,16 @@
+@@ -8076,14 +8092,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -129,7 +124,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -8127,9 +8142,9 @@
+@@ -8127,9 +8145,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -141,297 +136,11 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -8164,7 +8179,7 @@
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -8179,7 +8194,7 @@
- [am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.10.2], [],
-+m4_if([$1], [1.10.1], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -8193,12 +8208,12 @@
- # AM_SET_CURRENT_AUTOMAKE_VERSION
- # -------------------------------
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
--# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
-+# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10.2])dnl
-+[AM_AUTOMAKE_VERSION([1.10.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-+_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-@@ -8448,28 +8463,19 @@
-
- # Generate code to set up dependency tracking. -*- Autoconf -*-
-
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--#serial 4
-+#serial 3
-
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
--[# Autoconf 2.62 quotes --file arguments for eval, but not when files
--# are listed without --file. Let's play safe and only enable the eval
--# if we detect the quoting.
--case $CONFIG_FILES in
--*\'*) eval set x "$CONFIG_FILES" ;;
--*) set x $CONFIG_FILES ;;
--esac
--shift
--for mf
--do
-+[for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
-@@ -8813,13 +8819,13 @@
-
- # Helper functions for option handling. -*- Autoconf -*-
-
--# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
-+# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 4
-+# serial 3
-
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -8836,7 +8842,7 @@
- # ----------------------------------
- # OPTIONS is a space-separated list of Automake options.
- AC_DEFUN([_AM_SET_OPTIONS],
--[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
- # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
- # -------------------------------------------
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/config.guess pango1.0-1.24.0/config.guess
---- pango1.0-1.24.0.old/config.guess 2009-02-07 00:50:27.000000000 +0100
-+++ pango1.0-1.24.0/config.guess 2009-03-22 14:58:12.000000000 +0100
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
--timestamp='2008-11-15'
-+timestamp='2008-01-23'
-
- # 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
-@@ -331,20 +331,7 @@
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-- eval $set_cc_for_build
-- SUN_ARCH="i386"
-- # If there is a compiler, see if it is configured for 64-bit objects.
-- # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-- # This test works for both compilers.
-- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-- if echo '\n#ifdef __amd64\nIS_64BIT_ARCH\n#endif' | \
-- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-- grep IS_64BIT_ARCH >/dev/null
-- then
-- SUN_ARCH="x86_64"
-- fi
-- fi
-- echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -809,7 +796,7 @@
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd | genuineintel)
-+ EM64T | authenticamd)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -948,9 +935,6 @@
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-- padre:Linux:*:*)
-- echo sparc-unknown-linux-gnu
-- exit ;;
- parisc:Linux:*:* | hppa:Linux:*:*)
- # Look for CPU level
- case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -1001,6 +985,9 @@
- a.out-i386-linux)
- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit ;;
-+ coff-i386)
-+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-+ exit ;;
- "")
- # Either a pre-BFD a.out linker (linux-gnuoldld) or
- # one that does not give us useful --help.
-@@ -1229,9 +1216,6 @@
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
- exit ;;
-- BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
-- echo i586-pc-haiku
-- exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
- exit ;;
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/config.sub pango1.0-1.24.0/config.sub
---- pango1.0-1.24.0.old/config.sub 2009-02-07 00:50:27.000000000 +0100
-+++ pango1.0-1.24.0/config.sub 2009-03-22 14:58:12.000000000 +0100
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
--timestamp='2008-09-08'
-+timestamp='2008-01-16'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -250,14 +250,12 @@
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep | metag \
-+ | maxq | mb | microblaze | mcore | mep \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-- | mips64octeon | mips64octeonel \
-- | mips64orion | mips64orionel \
-- | mips64r5900 | mips64r5900el \
- | mips64vr | mips64vrel \
-+ | mips64orion | mips64orionel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
-@@ -288,7 +286,7 @@
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-- | z8k | z80)
-+ | z8k)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
-@@ -333,14 +331,12 @@
- | ip2k-* | iq2000-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-- | mips64octeon-* | mips64octeonel-* \
-- | mips64orion-* | mips64orionel-* \
-- | mips64r5900-* | mips64r5900el-* \
- | mips64vr-* | mips64vrel-* \
-+ | mips64orion-* | mips64orionel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
-@@ -368,14 +364,14 @@
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
-- | z8k-* | z80-*)
-+ | z8k-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
-@@ -463,10 +459,6 @@
- basic_machine=c90-cray
- os=-unicos
- ;;
-- cegcc)
-- basic_machine=arm-unknown
-- os=-cegcc
-- ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -534,10 +526,6 @@
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-- dicos)
-- basic_machine=i686-pc
-- os=-dicos
-- ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
-@@ -1140,10 +1128,6 @@
- basic_machine=z8k-unknown
- os=-sim
- ;;
-- z80-*-coff)
-- basic_machine=z80-unknown
-- os=-sim
-- ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -1264,7 +1248,7 @@
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -chorusos* | -chorusrdb* | -cegcc* \
-+ | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1404,9 +1388,6 @@
- -zvmoe)
- os=-zvmoe
- ;;
-- -dicos*)
-- os=-dicos
-- ;;
- -none)
- ;;
- *)
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/configure pango1.0-1.24.0/configure
---- pango1.0-1.24.0.old/configure 2009-03-16 23:35:07.000000000 +0100
-+++ pango1.0-1.24.0/configure 2009-03-22 14:58:15.000000000 +0100
+diff -Naur pango1.0-1.24.2.old/config.guess pango1.0-1.24.2/config.guess
+diff -Naur pango1.0-1.24.2.old/config.sub pango1.0-1.24.2/config.sub
+diff -Naur pango1.0-1.24.2.old/configure pango1.0-1.24.2/configure
+--- pango1.0-1.24.2.old/configure 2009-05-04 22:05:23.000000000 +0200
++++ pango1.0-1.24.2/configure 2009-05-14 09:37:16.000000000 +0200
@@ -6075,7 +6075,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -441,7 +150,17 @@
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
-@@ -10150,7 +10150,7 @@
+@@ -9968,6 +9968,9 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs=no
++ ;;
+ esac
+
+ ld_shlibs=yes
+@@ -10150,7 +10153,7 @@
fi
;;
@@ -450,7 +169,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -10325,6 +10325,7 @@
+@@ -10325,6 +10328,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -458,7 +177,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -10739,7 +10740,7 @@
+@@ -10739,7 +10743,7 @@
link_all_deplibs=yes
;;
@@ -467,7 +186,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -11701,13 +11702,10 @@
+@@ -11701,13 +11705,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -482,7 +201,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -11719,6 +11717,18 @@
+@@ -11719,6 +11720,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -501,25 +220,25 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -12652,7 +12662,7 @@
+@@ -12652,7 +12665,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12655 "configure"
-+#line 12665 "configure"
++#line 12668 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12748,7 +12758,7 @@
+@@ -12748,7 +12761,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12751 "configure"
-+#line 12761 "configure"
++#line 12764 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14644,7 +14654,7 @@
+@@ -14644,7 +14657,7 @@
;;
esac
;;
@@ -528,49 +247,49 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -14768,11 +14778,11 @@
+@@ -14768,11 +14781,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14771: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14781: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14784: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14775: \$? = $ac_status" >&5
-+ echo "$as_me:14785: \$? = $ac_status" >&5
++ echo "$as_me:14788: \$? = $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.
-@@ -14867,11 +14877,11 @@
+@@ -14867,11 +14880,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14870: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14880: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14883: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14874: \$? = $ac_status" >&5
-+ echo "$as_me:14884: \$? = $ac_status" >&5
++ echo "$as_me:14887: \$? = $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
-@@ -14919,11 +14929,11 @@
+@@ -14919,11 +14932,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14922: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14932: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14935: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14926: \$? = $ac_status" >&5
-+ echo "$as_me:14936: \$? = $ac_status" >&5
++ echo "$as_me:14939: \$? = $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
-@@ -14995,6 +15005,9 @@
+@@ -14995,6 +15008,9 @@
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'
;;
@@ -580,7 +299,7 @@
*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -15566,13 +15579,10 @@
+@@ -15566,13 +15582,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -595,7 +314,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -15584,6 +15594,18 @@
+@@ -15584,6 +15597,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -614,7 +333,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -19265,10 +19287,11 @@
+@@ -19265,10 +19290,11 @@
{ $as_echo "$as_me:$LINENO: checking for FONTCONFIG" >&5
$as_echo_n "checking for FONTCONFIG... " >&6; }
@@ -630,7 +349,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.5.0\"") >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= 2.5.0") 2>&5
ac_status=$?
-@@ -19278,13 +19301,15 @@
+@@ -19278,13 +19304,15 @@
else
pkg_failed=yes
fi
@@ -652,19 +371,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.5.0\"") >&5
($PKG_CONFIG --exists --print-errors "fontconfig >= 2.5.0") 2>&5
ac_status=$?
-@@ -19294,8 +19319,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -19308,9 +19334,9 @@
+@@ -19294,8 +19322,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -19308,9 +19337,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -676,7 +395,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$FONTCONFIG_PKG_ERRORS" >&5
-@@ -19341,10 +19367,11 @@
+@@ -19341,10 +19370,11 @@
{ $as_echo "$as_me:$LINENO: checking for FREETYPE" >&5
$as_echo_n "checking for FREETYPE... " >&6; }
@@ -692,7 +411,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
-@@ -19354,13 +19381,15 @@
+@@ -19354,13 +19384,15 @@
else
pkg_failed=yes
fi
@@ -714,19 +433,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2\"") >&5
($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
ac_status=$?
-@@ -19370,8 +19399,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -19384,9 +19414,9 @@
+@@ -19370,8 +19402,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -19384,9 +19417,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -738,7 +457,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$FREETYPE_PKG_ERRORS" >&5
-@@ -19434,10 +19464,11 @@
+@@ -19434,10 +19467,11 @@
{ $as_echo "$as_me:$LINENO: checking for XFT" >&5
$as_echo_n "checking for XFT... " >&6; }
@@ -754,7 +473,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
($PKG_CONFIG --exists --print-errors "xft >= 2.0.0 xrender") 2>&5
ac_status=$?
-@@ -19447,13 +19478,15 @@
+@@ -19447,13 +19481,15 @@
else
pkg_failed=yes
fi
@@ -776,19 +495,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xft >= 2.0.0 xrender\"") >&5
($PKG_CONFIG --exists --print-errors "xft >= 2.0.0 xrender") 2>&5
ac_status=$?
-@@ -19463,8 +19496,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -19477,9 +19511,9 @@
+@@ -19463,8 +19499,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -19477,9 +19514,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -800,7 +519,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$XFT_PKG_ERRORS" >&5
-@@ -19742,10 +19776,11 @@
+@@ -19742,10 +19779,11 @@
{ $as_echo "$as_me:$LINENO: checking for CAIRO" >&5
$as_echo_n "checking for CAIRO... " >&6; }
@@ -816,7 +535,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
($PKG_CONFIG --exists --print-errors "cairo >= $cairo_required") 2>&5
ac_status=$?
-@@ -19755,13 +19790,15 @@
+@@ -19755,13 +19793,15 @@
else
pkg_failed=yes
fi
@@ -838,19 +557,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"cairo >= \$cairo_required\"") >&5
($PKG_CONFIG --exists --print-errors "cairo >= $cairo_required") 2>&5
ac_status=$?
-@@ -19771,8 +19808,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -19785,9 +19823,9 @@
+@@ -19771,8 +19811,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -19785,9 +19826,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -862,7 +581,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$CAIRO_PKG_ERRORS" >&5
-@@ -20070,10 +20108,11 @@
+@@ -20070,10 +20111,11 @@
{ $as_echo "$as_me:$LINENO: checking for GLIB" >&5
$as_echo_n "checking for GLIB... " >&6; }
@@ -878,7 +597,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "$GLIB_MODULES") 2>&5
ac_status=$?
-@@ -20083,13 +20122,15 @@
+@@ -20083,13 +20125,15 @@
else
pkg_failed=yes
fi
@@ -900,19 +619,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GLIB_MODULES\"") >&5
($PKG_CONFIG --exists --print-errors "$GLIB_MODULES") 2>&5
ac_status=$?
-@@ -20099,8 +20140,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -20113,9 +20155,9 @@
+@@ -20099,8 +20143,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -20113,9 +20158,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -924,7 +643,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$GLIB_PKG_ERRORS" >&5
-@@ -20166,10 +20208,11 @@
+@@ -20166,10 +20211,11 @@
{ $as_echo "$as_me:$LINENO: checking for LIBTHAI" >&5
$as_echo_n "checking for LIBTHAI... " >&6; }
@@ -940,7 +659,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libthai >= $LIBTHAI_REQUIRED_VERSION") 2>&5
ac_status=$?
-@@ -20179,13 +20222,15 @@
+@@ -20179,13 +20225,15 @@
else
pkg_failed=yes
fi
@@ -962,19 +681,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libthai >= \$LIBTHAI_REQUIRED_VERSION\"") >&5
($PKG_CONFIG --exists --print-errors "libthai >= $LIBTHAI_REQUIRED_VERSION") 2>&5
ac_status=$?
-@@ -20195,8 +20240,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -20209,9 +20255,9 @@
+@@ -20195,8 +20243,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -20209,9 +20258,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -986,7 +705,7 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBTHAI_PKG_ERRORS" >&5
-@@ -20240,10 +20286,11 @@
+@@ -20240,10 +20289,11 @@
{ $as_echo "$as_me:$LINENO: checking for INTROSPECTION" >&5
$as_echo_n "checking for INTROSPECTION... " >&6; }
@@ -1002,7 +721,7 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.2\"") >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.2") 2>&5
ac_status=$?
-@@ -20253,13 +20300,15 @@
+@@ -20253,13 +20303,15 @@
else
pkg_failed=yes
fi
@@ -1024,19 +743,19 @@
{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.6.2\"") >&5
($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.6.2") 2>&5
ac_status=$?
-@@ -20269,8 +20318,9 @@
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
-+ fi
-+else
-+ pkg_failed=untried
- fi
-
-
-@@ -20283,9 +20333,9 @@
+@@ -20269,8 +20321,9 @@
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -20283,9 +20336,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -1048,162 +767,15 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$INTROSPECTION_PKG_ERRORS" >&5
-@@ -23709,16 +23759,7 @@
-
-
- case $ac_file$ac_mode in
-- "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files
--# are listed without --file. Let's play safe and only enable the eval
--# if we detect the quoting.
--case $CONFIG_FILES in
--*\'*) eval set x "$CONFIG_FILES" ;;
--*) set x $CONFIG_FILES ;;
--esac
--shift
--for mf
--do
-+ "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
- # Strip MF so we end up with the name of the file.
- mf=`echo "$mf" | sed -e 's/:.*$//'`
- # Check whether this is an Automake generated Makefile or not.
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/docs/Makefile.in pango1.0-1.24.0/docs/Makefile.in
---- pango1.0-1.24.0.old/docs/Makefile.in 2009-03-16 23:35:01.000000000 +0100
-+++ pango1.0-1.24.0/docs/Makefile.in 2009-03-22 14:58:12.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -367,8 +367,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -411,8 +411,8 @@
- esac; \
- done; \
- for i in $$list; do \
-- if test -f $$i; then file=$$i; \
-- else file=$(srcdir)/$$i; fi; \
-+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+ else file=$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
-@@ -453,7 +453,7 @@
-
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -464,7 +464,7 @@
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -476,7 +476,7 @@
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -490,36 +490,23 @@
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/examples/Makefile.in pango1.0-1.24.0/examples/Makefile.in
---- pango1.0-1.24.0.old/examples/Makefile.in 2009-03-16 23:35:01.000000000 +0100
-+++ pango1.0-1.24.0/examples/Makefile.in 2009-03-22 14:58:12.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -285,8 +285,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -369,7 +369,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/ltmain.sh pango1.0-1.24.0/ltmain.sh
---- pango1.0-1.24.0.old/ltmain.sh 2009-02-07 00:50:08.000000000 +0100
-+++ pango1.0-1.24.0/ltmain.sh 2009-03-22 14:58:08.000000000 +0100
+diff -Naur pango1.0-1.24.2.old/ltmain.sh pango1.0-1.24.2/ltmain.sh
+--- pango1.0-1.24.2.old/ltmain.sh 2009-04-18 03:17:31.000000000 +0200
++++ pango1.0-1.24.2/ltmain.sh 2009-05-14 09:37:10.000000000 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1
++# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -1212,7 +784,7 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-1"
++VERSION="2.2.6 Debian-2.2.6a-4"
TIMESTAMP=""
package_revision=1.3012
@@ -1228,7 +800,45 @@
esac
fi
if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -6206,6 +6209,9 @@
+@@ -5344,19 +5347,19 @@
+ # 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 @@
+ 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 @@
revision="$number_minor"
lt_irix_increment=no
;;
@@ -1238,643 +848,3 @@
esac
;;
no)
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/Makefile.in pango1.0-1.24.0/Makefile.in
---- pango1.0-1.24.0.old/Makefile.in 2009-03-16 23:35:05.000000000 +0100
-+++ pango1.0-1.24.0/Makefile.in 2009-03-22 14:58:14.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -416,7 +416,7 @@
- -rm -rf .libs _libs
-
- distclean-libtool:
-- -rm -f libtool config.lt
-+ -rm -f libtool
- install-pkgconfigDATA: $(pkgconfig_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
-@@ -510,7 +510,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/arabic/Makefile.in pango1.0-1.24.0/modules/arabic/Makefile.in
---- pango1.0-1.24.0.old/modules/arabic/Makefile.in 2009-03-16 23:35:02.000000000 +0100
-+++ pango1.0-1.24.0/modules/arabic/Makefile.in 2009-03-22 14:58:12.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -351,8 +351,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -487,7 +487,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/basic/Makefile.in pango1.0-1.24.0/modules/basic/Makefile.in
---- pango1.0-1.24.0.old/modules/basic/Makefile.in 2009-03-16 23:35:02.000000000 +0100
-+++ pango1.0-1.24.0/modules/basic/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -407,8 +407,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -560,7 +560,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/hangul/Makefile.in pango1.0-1.24.0/modules/hangul/Makefile.in
---- pango1.0-1.24.0.old/modules/hangul/Makefile.in 2009-03-16 23:35:02.000000000 +0100
-+++ pango1.0-1.24.0/modules/hangul/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -317,8 +317,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -431,7 +431,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/hebrew/Makefile.in pango1.0-1.24.0/modules/hebrew/Makefile.in
---- pango1.0-1.24.0.old/modules/hebrew/Makefile.in 2009-03-16 23:35:02.000000000 +0100
-+++ pango1.0-1.24.0/modules/hebrew/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -317,8 +317,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -440,7 +440,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/indic/Makefile.in pango1.0-1.24.0/modules/indic/Makefile.in
---- pango1.0-1.24.0.old/modules/indic/Makefile.in 2009-03-16 23:35:03.000000000 +0100
-+++ pango1.0-1.24.0/modules/indic/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -356,8 +356,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -510,7 +510,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/khmer/Makefile.in pango1.0-1.24.0/modules/khmer/Makefile.in
---- pango1.0-1.24.0.old/modules/khmer/Makefile.in 2009-03-16 23:35:03.000000000 +0100
-+++ pango1.0-1.24.0/modules/khmer/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -315,8 +315,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -429,7 +429,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/Makefile.in pango1.0-1.24.0/modules/Makefile.in
---- pango1.0-1.24.0.old/modules/Makefile.in 2009-03-16 23:35:02.000000000 +0100
-+++ pango1.0-1.24.0/modules/Makefile.in 2009-03-22 14:58:12.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -258,8 +258,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -365,7 +365,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/syriac/Makefile.in pango1.0-1.24.0/modules/syriac/Makefile.in
---- pango1.0-1.24.0.old/modules/syriac/Makefile.in 2009-03-16 23:35:03.000000000 +0100
-+++ pango1.0-1.24.0/modules/syriac/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -319,8 +319,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -442,7 +442,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/thai/Makefile.in pango1.0-1.24.0/modules/thai/Makefile.in
---- pango1.0-1.24.0.old/modules/thai/Makefile.in 2009-03-16 23:35:03.000000000 +0100
-+++ pango1.0-1.24.0/modules/thai/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -351,8 +351,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -496,7 +496,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/modules/tibetan/Makefile.in pango1.0-1.24.0/modules/tibetan/Makefile.in
---- pango1.0-1.24.0.old/modules/tibetan/Makefile.in 2009-03-16 23:35:04.000000000 +0100
-+++ pango1.0-1.24.0/modules/tibetan/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -314,8 +314,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -428,7 +428,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango/Makefile.in pango1.0-1.24.0/pango/Makefile.in
---- pango1.0-1.24.0.old/pango/Makefile.in 2009-03-16 23:35:04.000000000 +0100
-+++ pango1.0-1.24.0/pango/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -701,8 +701,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -1117,7 +1117,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -1173,7 +1173,7 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -1184,7 +1184,7 @@
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -1196,7 +1196,7 @@
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -1210,36 +1210,23 @@
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango/mini-fribidi/Makefile.in pango1.0-1.24.0/pango/mini-fribidi/Makefile.in
---- pango1.0-1.24.0.old/pango/mini-fribidi/Makefile.in 2009-03-16 23:35:04.000000000 +0100
-+++ pango1.0-1.24.0/pango/mini-fribidi/Makefile.in 2009-03-22 14:58:14.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -274,8 +274,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -353,7 +353,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango/opentype/Makefile.in pango1.0-1.24.0/pango/opentype/Makefile.in
---- pango1.0-1.24.0.old/pango/opentype/Makefile.in 2009-03-16 23:35:05.000000000 +0100
-+++ pango1.0-1.24.0/pango/opentype/Makefile.in 2009-03-22 14:58:14.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -317,8 +317,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -406,7 +406,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/pango-view/Makefile.in pango1.0-1.24.0/pango-view/Makefile.in
---- pango1.0-1.24.0.old/pango-view/Makefile.in 2009-03-16 23:35:04.000000000 +0100
-+++ pango1.0-1.24.0/pango-view/Makefile.in 2009-03-22 14:58:13.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -361,8 +361,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -487,8 +487,8 @@
- esac; \
- done; \
- for i in $$list; do \
-- if test -f $$i; then file=$$i; \
-- else file=$(srcdir)/$$i; fi; \
-+ if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
-+ else file=$$i; fi; \
- ext=`echo $$i | sed -e 's/^.*\\.//'`; \
- case "$$ext" in \
- 1*) ;; \
-@@ -527,7 +527,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/tests/Makefile.in pango1.0-1.24.0/tests/Makefile.in
---- pango1.0-1.24.0.old/tests/Makefile.in 2009-03-16 23:35:05.000000000 +0100
-+++ pango1.0-1.24.0/tests/Makefile.in 2009-03-22 14:58:14.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -326,8 +326,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -464,7 +464,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-@@ -507,7 +507,7 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- check-TESTS: $(TESTS)
-- @failed=0; all=0; xfail=0; xpass=0; skip=0; \
-+ @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \
- srcdir=$(srcdir); export srcdir; \
- list=' $(TESTS) '; \
- if test -n "$$list"; then \
-@@ -518,7 +518,7 @@
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xpass=`expr $$xpass + 1`; \
- failed=`expr $$failed + 1`; \
- echo "XPASS: $$tst"; \
-@@ -530,7 +530,7 @@
- elif test $$? -ne 77; then \
- all=`expr $$all + 1`; \
- case " $(XFAIL_TESTS) " in \
-- *[\ \ ]$$tst[\ \ ]*) \
-+ *$$ws$$tst$$ws*) \
- xfail=`expr $$xfail + 1`; \
- echo "XFAIL: $$tst"; \
- ;; \
-@@ -544,36 +544,23 @@
- echo "SKIP: $$tst"; \
- fi; \
- done; \
-- if test "$$all" -eq 1; then \
-- tests="test"; \
-- All=""; \
-- else \
-- tests="tests"; \
-- All="All "; \
-- fi; \
- if test "$$failed" -eq 0; then \
- if test "$$xfail" -eq 0; then \
-- banner="$$All$$all $$tests passed"; \
-+ banner="All $$all tests passed"; \
- else \
-- if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
-- banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
-+ banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
- fi; \
- else \
- if test "$$xpass" -eq 0; then \
-- banner="$$failed of $$all $$tests failed"; \
-+ banner="$$failed of $$all tests failed"; \
- else \
-- if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
-- banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
-+ banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
- fi; \
- fi; \
- dashes="$$banner"; \
- skipped=""; \
- if test "$$skip" -ne 0; then \
-- if test "$$skip" -eq 1; then \
-- skipped="($$skip test was not run)"; \
-- else \
-- skipped="($$skip tests were not run)"; \
-- fi; \
-+ skipped="($$skip tests were not run)"; \
- test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
- dashes="$$skipped"; \
- fi; \
-diff -Naur -x'*INSTALL' pango1.0-1.24.0.old/tools/Makefile.in pango1.0-1.24.0/tools/Makefile.in
---- pango1.0-1.24.0.old/tools/Makefile.in 2009-03-16 23:35:05.000000000 +0100
-+++ pango1.0-1.24.0/tools/Makefile.in 2009-03-22 14:58:14.000000000 +0100
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.10.2 from Makefile.am.
-+# Makefile.in generated by automake 1.10.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -259,8 +259,8 @@
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-- && { if test -f $@; then exit 0; else break; fi; }; \
-+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+ && exit 0; \
- exit 1;; \
- esac; \
- done; \
-@@ -328,7 +328,7 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
- END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
More information about the pkg-gnome-commits
mailing list