r22367 - in /desktop/unstable/vte/debian: changelog patches/90_autoreconf.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Nov 18 06:45:08 UTC 2009
Author: slomo
Date: Wed Nov 18 06:45:08 2009
New Revision: 22367
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22367
Log:
* New upstream release.
- debian/patches/90_autoreconf.patch:
+ Refreshed.
Modified:
desktop/unstable/vte/debian/changelog
desktop/unstable/vte/debian/patches/90_autoreconf.patch
Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=22367&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Wed Nov 18 06:45:08 2009
@@ -1,3 +1,11 @@
+vte (1:0.22.5-1) unstable; urgency=low
+
+ * New upstream release.
+ - debian/patches/90_autoreconf.patch:
+ + Refreshed.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 18 Nov 2009 07:40:57 +0100
+
vte (1:0.22.4-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/vte/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/90_autoreconf.patch?rev=22367&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/90_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/90_autoreconf.patch [utf-8] Wed Nov 18 06:45:08 2009
@@ -1,5 +1,6 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
+diff -Naur vte-0.22.5.old/aclocal.m4 vte-0.22.5/aclocal.m4
+--- vte-0.22.5.old/aclocal.m4 2009-11-17 19:41:05.000000000 +0100
++++ vte-0.22.5/aclocal.m4 2009-11-18 07:43:57.000000000 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -164,8 +165,9 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
---- a/config.h.in
-+++ b/config.h.in
+diff -Naur vte-0.22.5.old/config.h.in vte-0.22.5/config.h.in
+--- vte-0.22.5.old/config.h.in 2009-11-17 19:42:06.000000000 +0100
++++ vte-0.22.5/config.h.in 2009-11-18 07:43:59.000000000 +0100
@@ -209,6 +209,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -176,13 +178,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
---- a/configure
-+++ b/configure
+diff -Naur vte-0.22.5.old/configure vte-0.22.5/configure
+--- vte-0.22.5.old/configure 2009-11-17 19:41:26.000000000 +0100
++++ vte-0.22.5/configure 2009-11-18 07:43:58.000000000 +0100
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for vte 0.22.4.
-+# Generated by GNU Autoconf 2.64 for vte 0.22.4.
+-# Generated by GNU Autoconf 2.63 for vte 0.22.5.
++# Generated by GNU Autoconf 2.64 for vte 0.22.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vte>.
#
@@ -976,8 +979,8 @@
# Identity of this package.
PACKAGE_NAME='vte'
@@ -748,6 +702,7 @@
- PACKAGE_VERSION='0.22.4'
- PACKAGE_STRING='vte 0.22.4'
+ PACKAGE_VERSION='0.22.5'
+ PACKAGE_STRING='vte 0.22.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vte'
+PACKAGE_URL=''
@@ -1133,7 +1136,7 @@
@@ -1798,21 +1746,471 @@
if $ac_init_version; then
cat <<\_ACEOF
- vte configure 0.22.4
+ vte configure 0.22.5
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.64
@@ -1600,7 +1603,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by vte $as_me 0.22.4, which was
+ It was created by vte $as_me 0.22.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
@@ -15685,7 +15688,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by vte $as_me 0.22.4, which was
+ This file was extended by vte $as_me 0.22.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
@@ -15716,7 +15719,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- vte config.status 0.22.4
+ vte config.status 0.22.5
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -16255,8 +16258,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
+diff -Naur vte-0.22.5.old/doc/Makefile.in vte-0.22.5/doc/Makefile.in
+--- vte-0.22.5.old/doc/Makefile.in 2009-11-17 19:41:16.000000000 +0100
++++ vte-0.22.5/doc/Makefile.in 2009-11-18 07:44:00.000000000 +0100
@@ -179,6 +179,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -16265,8 +16269,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/doc/openi18n/Makefile.in
-+++ b/doc/openi18n/Makefile.in
+diff -Naur vte-0.22.5.old/doc/openi18n/Makefile.in vte-0.22.5/doc/openi18n/Makefile.in
+--- vte-0.22.5.old/doc/openi18n/Makefile.in 2009-11-17 19:41:16.000000000 +0100
++++ vte-0.22.5/doc/openi18n/Makefile.in 2009-11-18 07:44:00.000000000 +0100
@@ -170,6 +170,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -16275,8 +16280,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/doc/reference/Makefile.in
-+++ b/doc/reference/Makefile.in
+diff -Naur vte-0.22.5.old/doc/reference/Makefile.in vte-0.22.5/doc/reference/Makefile.in
+--- vte-0.22.5.old/doc/reference/Makefile.in 2009-11-17 19:41:17.000000000 +0100
++++ vte-0.22.5/doc/reference/Makefile.in 2009-11-18 07:44:00.000000000 +0100
@@ -149,6 +149,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -16285,8 +16291,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/glade/Makefile.in
-+++ b/glade/Makefile.in
+diff -Naur vte-0.22.5.old/glade/Makefile.in vte-0.22.5/glade/Makefile.in
+--- vte-0.22.5.old/glade/Makefile.in 2009-11-17 19:41:17.000000000 +0100
++++ vte-0.22.5/glade/Makefile.in 2009-11-18 07:44:00.000000000 +0100
@@ -163,6 +163,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -16295,8 +16302,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/gnome-pty-helper/aclocal.m4
-+++ b/gnome-pty-helper/aclocal.m4
+diff -Naur vte-0.22.5.old/gnome-pty-helper/aclocal.m4 vte-0.22.5/gnome-pty-helper/aclocal.m4
+--- vte-0.22.5.old/gnome-pty-helper/aclocal.m4 2009-08-01 08:18:35.000000000 +0200
++++ vte-0.22.5/gnome-pty-helper/aclocal.m4 2009-11-18 07:43:48.000000000 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -16308,8 +16316,9 @@
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.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
---- a/gnome-pty-helper/config.h.in
-+++ b/gnome-pty-helper/config.h.in
+diff -Naur vte-0.22.5.old/gnome-pty-helper/config.h.in vte-0.22.5/gnome-pty-helper/config.h.in
+--- vte-0.22.5.old/gnome-pty-helper/config.h.in 2009-09-14 20:35:31.000000000 +0200
++++ vte-0.22.5/gnome-pty-helper/config.h.in 2009-11-18 07:43:50.000000000 +0100
@@ -180,6 +180,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -16320,8 +16329,9 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
---- a/gnome-pty-helper/configure
-+++ b/gnome-pty-helper/configure
+diff -Naur vte-0.22.5.old/gnome-pty-helper/configure vte-0.22.5/gnome-pty-helper/configure
+--- vte-0.22.5.old/gnome-pty-helper/configure 2009-09-14 20:34:45.000000000 +0200
++++ vte-0.22.5/gnome-pty-helper/configure 2009-11-18 07:43:49.000000000 +0100
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -23996,8 +24006,9 @@
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi
---- a/gnome-pty-helper/Makefile.in
-+++ b/gnome-pty-helper/Makefile.in
+diff -Naur vte-0.22.5.old/gnome-pty-helper/Makefile.in vte-0.22.5/gnome-pty-helper/Makefile.in
+--- vte-0.22.5.old/gnome-pty-helper/Makefile.in 2009-11-08 18:14:43.000000000 +0100
++++ vte-0.22.5/gnome-pty-helper/Makefile.in 2009-11-18 07:43:51.000000000 +0100
@@ -118,6 +118,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -24006,8 +24017,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
SET_MAKE = @SET_MAKE@
---- a/ltmain.sh
-+++ b/ltmain.sh
+diff -Naur vte-0.22.5.old/ltmain.sh vte-0.22.5/ltmain.sh
+--- vte-0.22.5.old/ltmain.sh 2009-09-14 20:35:21.000000000 +0200
++++ vte-0.22.5/ltmain.sh 2009-11-18 07:43:52.000000000 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -24086,8 +24098,9 @@
esac
;;
no)
---- a/Makefile.in
-+++ b/Makefile.in
+diff -Naur vte-0.22.5.old/Makefile.in vte-0.22.5/Makefile.in
+--- vte-0.22.5.old/Makefile.in 2009-11-17 19:41:21.000000000 +0100
++++ vte-0.22.5/Makefile.in 2009-11-18 07:44:01.000000000 +0100
@@ -222,6 +222,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -24096,8 +24109,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/perf/Makefile.in
-+++ b/perf/Makefile.in
+diff -Naur vte-0.22.5.old/perf/Makefile.in vte-0.22.5/perf/Makefile.in
+--- vte-0.22.5.old/perf/Makefile.in 2009-11-17 19:41:17.000000000 +0100
++++ vte-0.22.5/perf/Makefile.in 2009-11-18 07:44:00.000000000 +0100
@@ -139,6 +139,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -24106,8 +24120,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
+diff -Naur vte-0.22.5.old/po/Makefile.in.in vte-0.22.5/po/Makefile.in.in
+--- vte-0.22.5.old/po/Makefile.in.in 2009-09-14 20:35:21.000000000 +0200
++++ vte-0.22.5/po/Makefile.in.in 2009-11-18 07:43:52.000000000 +0100
@@ -129,7 +129,7 @@
done
@@ -24117,8 +24132,9 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
---- a/python/Makefile.in
-+++ b/python/Makefile.in
+diff -Naur vte-0.22.5.old/python/Makefile.in vte-0.22.5/python/Makefile.in
+--- vte-0.22.5.old/python/Makefile.in 2009-11-17 19:41:18.000000000 +0100
++++ vte-0.22.5/python/Makefile.in 2009-11-18 07:44:00.000000000 +0100
@@ -210,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -24127,8 +24143,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+diff -Naur vte-0.22.5.old/src/Makefile.in vte-0.22.5/src/Makefile.in
+--- vte-0.22.5.old/src/Makefile.in 2009-11-17 19:41:21.000000000 +0100
++++ vte-0.22.5/src/Makefile.in 2009-11-18 07:44:01.000000000 +0100
@@ -332,6 +332,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -24137,8 +24154,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/termcaps/Makefile.in
-+++ b/termcaps/Makefile.in
+diff -Naur vte-0.22.5.old/termcaps/Makefile.in vte-0.22.5/termcaps/Makefile.in
+--- vte-0.22.5.old/termcaps/Makefile.in 2009-11-17 19:41:21.000000000 +0100
++++ vte-0.22.5/termcaps/Makefile.in 2009-11-18 07:44:01.000000000 +0100
@@ -164,6 +164,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
@@ -24147,373 +24165,3 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/config.guess
-+++ b/config.guess
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-27'
-+timestamp='2009-06-10'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -822,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
---- a/config.sub
-+++ b/config.sub
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -467,6 +470,10 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -1260,7 +1267,7 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
---- a/gnome-pty-helper/config.guess
-+++ b/gnome-pty-helper/config.guess
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-27'
-+timestamp='2009-06-10'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -822,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
---- a/gnome-pty-helper/config.sub
-+++ b/gnome-pty-helper/config.sub
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -467,6 +470,10 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -1260,7 +1267,7 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
More information about the pkg-gnome-commits
mailing list