r21939 - /desktop/unstable/seahorse/debian/patches/90_autotools.patch
av-guest at users.alioth.debian.org
av-guest at users.alioth.debian.org
Thu Oct 15 20:58:56 UTC 2009
Author: av-guest
Date: Thu Oct 15 20:58:56 2009
New Revision: 21939
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21939
Log:
refreshing 90_autotools.patch to apply cleanly
Modified:
desktop/unstable/seahorse/debian/patches/90_autotools.patch
Modified: desktop/unstable/seahorse/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/90_autotools.patch?rev=21939&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/90_autotools.patch [utf-8] Thu Oct 15 20:58:56 2009
@@ -6,8 +6,8 @@
Index: seahorse-2.28.0/INSTALL
===================================================================
---- seahorse-2.28.0.orig/INSTALL 2009-04-18 05:22:13.000000000 +0200
-+++ seahorse-2.28.0/INSTALL 2009-10-15 21:01:02.000000000 +0200
+--- seahorse-2.28.0.orig/INSTALL 2009-04-18 03:22:13.000000000 +0000
++++ seahorse-2.28.0/INSTALL 2009-10-15 20:10:53.000000000 +0000
@@ -1,16 +1,19 @@
Installation Instructions
*************************
@@ -290,8 +290,8 @@
Index: seahorse-2.28.0/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/Makefile.in 2009-09-21 18:25:29.000000000 +0200
-+++ seahorse-2.28.0/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/Makefile.in 2009-09-21 16:25:29.000000000 +0000
++++ seahorse-2.28.0/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -245,8 +245,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -301,88 +301,212 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.28.0/aclocal.m4
-===================================================================
---- seahorse-2.28.0.orig/aclocal.m4 2009-09-21 18:25:25.000000000 +0200
-+++ seahorse-2.28.0/aclocal.m4 2009-10-15 21:00:54.000000000 +0200
-@@ -19,51 +19,6 @@
- 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'.])])
-
--dnl AM_GCONF_SOURCE_2
--dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
--dnl (i.e. pass to gconftool-2
--dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
--dnl you should install foo.schemas files
--dnl
--
--AC_DEFUN([AM_GCONF_SOURCE_2],
--[
-- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-- else
-- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-- fi
--
-- AC_ARG_WITH([gconf-source],
-- AC_HELP_STRING([--with-gconf-source=sourceaddress],
-- [Config database for installing schema files.]),
-- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
--
-- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
--
-- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-- fi
--
-- AC_ARG_WITH([gconf-schema-file-dir],
-- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-- [Directory for installing schema files.]),
-- [GCONF_SCHEMA_FILE_DIR="$withval"],)
--
-- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
--
-- AC_ARG_ENABLE(schemas-install,
-- AC_HELP_STRING([--disable-schemas-install],
-- [Disable the schemas installation]),
-- [case ${enableval} in
-- yes|no) ;;
-- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-- esac])
-- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
--])
--
- # Copyright (C) 1995-2002 Free Software Foundation, Inc.
- # Copyright (C) 2001-2003,2004 Red Hat, Inc.
- #
Index: seahorse-2.28.0/common/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/common/Makefile.in 2009-09-21 18:25:27.000000000 +0200
-+++ seahorse-2.28.0/common/Makefile.in 2009-10-15 21:00:59.000000000 +0200
-@@ -132,8 +132,6 @@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FGREP = @FGREP@
--GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
--GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
- GLIB_PREFIX = @GLIB_PREFIX@
-@@ -216,8 +214,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
+--- seahorse-2.28.0.orig/common/Makefile.in 2009-09-21 16:25:27.000000000 +0000
++++ seahorse-2.28.0/common/Makefile.in 2009-10-15 20:10:12.000000000 +0000
+@@ -216,8 +216,6 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+Index: seahorse-2.28.0/config.guess
+===================================================================
+--- seahorse-2.28.0.orig/config.guess 2009-10-15 20:11:04.000000000 +0000
++++ seahorse-2.28.0/config.guess 2009-10-15 20:10:49.000000000 +0000
+@@ -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:*:*)
+Index: seahorse-2.28.0/config.sub
+===================================================================
+--- seahorse-2.28.0.orig/config.sub 2009-10-15 20:11:04.000000000 +0000
++++ seahorse-2.28.0/config.sub 2009-10-15 20:10:49.000000000 +0000
+@@ -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*)
Index: seahorse-2.28.0/configure
===================================================================
---- seahorse-2.28.0.orig/configure 2009-09-21 18:25:26.000000000 +0200
-+++ seahorse-2.28.0/configure 2009-10-15 21:01:04.000000000 +0200
+--- seahorse-2.28.0.orig/configure 2009-09-21 16:25:26.000000000 +0000
++++ seahorse-2.28.0/configure 2009-10-15 20:10:59.000000000 +0000
@@ -773,8 +773,6 @@
WITH_TESTS_TRUE
WITH_SSH_FALSE
@@ -392,248 +516,149 @@
WITH_PKCS11_FALSE
WITH_PKCS11_TRUE
GP11_LIBS
-@@ -827,10 +825,6 @@
- OMF_DIR
- HELP_DIR
- PKG_CONFIG
--GCONF_SCHEMAS_INSTALL_FALSE
--GCONF_SCHEMAS_INSTALL_TRUE
--GCONF_SCHEMA_FILE_DIR
--GCONF_SCHEMA_CONFIG_SOURCE
- CXXCPP
- CPP
- OTOOL64
-@@ -991,9 +985,6 @@
- enable_fast_install
- with_gnu_ld
- enable_libtool_lock
--with_gconf_source
--with_gconf_schema_file_dir
--enable_schemas_install
- with_help_dir
- with_omf_dir
- with_help_formats
-@@ -1681,8 +1672,6 @@
- --enable-fast-install[=PKGS]
- optimize for fast installation [default=yes]
- --disable-libtool-lock avoid locking (might break parallel builds)
-- --disable-schemas-install
-- Disable the schemas installation
- --disable-scrollkeeper do not make updates to the scrollkeeper database
- --enable-gtk-doc use gtk-doc to build documentation [default=no]
- --disable-largefile omit support for large files
-@@ -1708,10 +1697,6 @@
- --with-pic try to use only PIC/non-PIC objects [default=use
- both]
- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
-- --with-gconf-source=sourceaddress
-- Config database for installing schema files.
-- --with-gconf-schema-file-dir=dir
-- Directory for installing schema files.
- --with-help-dir=DIR path to help docs
- --with-omf-dir=DIR path to OMF files
- --with-help-formats=FORMATS
-@@ -5846,13 +5831,13 @@
+@@ -5846,13 +5844,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:5849: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5834: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5847: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:5852: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5837: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5850: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:5855: output\"" >&5)
-+ (eval echo "\"\$as_me:5840: output\"" >&5)
++ (eval echo "\"\$as_me:5853: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -7057,7 +7042,7 @@
+@@ -7057,7 +7055,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7060 "configure"' > conftest.$ac_ext
-+ echo '#line 7045 "configure"' > conftest.$ac_ext
++ echo '#line 7058 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9114,11 +9099,11 @@
+@@ -9114,11 +9112,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:9117: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9102: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9115: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9121: \$? = $ac_status" >&5
-+ echo "$as_me:9106: \$? = $ac_status" >&5
++ echo "$as_me:9119: \$? = $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.
-@@ -9453,11 +9438,11 @@
+@@ -9453,11 +9451,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:9456: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9454: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9460: \$? = $ac_status" >&5
-+ echo "$as_me:9445: \$? = $ac_status" >&5
++ echo "$as_me:9458: \$? = $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.
-@@ -9558,11 +9543,11 @@
+@@ -9558,11 +9556,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:9561: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9559: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9565: \$? = $ac_status" >&5
-+ echo "$as_me:9550: \$? = $ac_status" >&5
++ echo "$as_me:9563: \$? = $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
-@@ -9613,11 +9598,11 @@
+@@ -9613,11 +9611,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:9616: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9614: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9620: \$? = $ac_status" >&5
-+ echo "$as_me:9605: \$? = $ac_status" >&5
++ echo "$as_me:9618: \$? = $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
-@@ -11996,7 +11981,7 @@
+@@ -11996,7 +11994,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 11999 "configure"
-+#line 11984 "configure"
++#line 11997 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12092,7 +12077,7 @@
+@@ -12092,7 +12090,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12095 "configure"
-+#line 12080 "configure"
++#line 12093 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14048,11 +14033,11 @@
+@@ -14048,11 +14046,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:14051: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14036: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14049: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14055: \$? = $ac_status" >&5
-+ echo "$as_me:14040: \$? = $ac_status" >&5
++ echo "$as_me:14053: \$? = $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.
-@@ -14147,11 +14132,11 @@
+@@ -14147,11 +14145,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:14150: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14135: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14148: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14154: \$? = $ac_status" >&5
-+ echo "$as_me:14139: \$? = $ac_status" >&5
++ echo "$as_me:14152: \$? = $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
-@@ -14199,11 +14184,11 @@
+@@ -14199,11 +14197,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:14202: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14187: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14200: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14206: \$? = $ac_status" >&5
-+ echo "$as_me:14191: \$? = $ac_status" >&5
++ echo "$as_me:14204: \$? = $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
-@@ -15166,56 +15151,7 @@
- # Only expand once:
-
-
--
-- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-- else
-- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-- fi
--
--
--# Check whether --with-gconf-source was given.
--if test "${with_gconf_source+set}" = set; then :
-- withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
--fi
--
--
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
--$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
--
-- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-- fi
--
--
--# Check whether --with-gconf-schema-file-dir was given.
--if test "${with_gconf_schema_file_dir+set}" = set; then :
-- withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
--fi
--
--
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
--$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
--
-- # Check whether --enable-schemas-install was given.
--if test "${enable_schemas_install+set}" = set; then :
-- enableval=$enable_schemas_install; case ${enableval} in
-- yes|no) ;;
-- *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-- esac
--fi
--
-- if test "$enable_schemas_install" != no; then
-- GCONF_SCHEMAS_INSTALL_TRUE=
-- GCONF_SCHEMAS_INSTALL_FALSE='#'
--else
-- GCONF_SCHEMAS_INSTALL_TRUE='#'
-- GCONF_SCHEMAS_INSTALL_FALSE=
--fi
--
--
-+AM_GCONF_SOURCE_2
-
-
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-@@ -17239,106 +17175,26 @@
+@@ -17239,106 +17237,26 @@
echo "disabling ssh support"
else
@@ -663,7 +688,9 @@
-done
- done
-IFS=$as_save_IFS
--
++# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
++# AC_PATH_PROG(SSH_PATH, ssh, "failed")
+
- test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed""
- ;;
-esac
@@ -719,9 +746,7 @@
-fi
-
-
-+# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
-+# AC_PATH_PROG(SSH_PATH, ssh, "failed")
-
+-
- if test $SSH_KEYGEN_PATH != "failed" &&
- test $SSH_PATH != "failed"; then
+# if test $SSH_KEYGEN_PATH != "failed" && i
@@ -747,40 +772,20 @@
fi
-@@ -18614,10 +18470,6 @@
- as_fn_error "conditional \"am__fastdepCXX\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-- as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
- if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
- as_fn_error "conditional \"ENABLE_SK\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
Index: seahorse-2.28.0/daemon/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/daemon/Makefile.in 2009-09-21 18:25:27.000000000 +0200
-+++ seahorse-2.28.0/daemon/Makefile.in 2009-10-15 21:00:59.000000000 +0200
-@@ -181,8 +181,6 @@
- EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- FGREP = @FGREP@
--GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
--GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
- GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
- GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
- GLIB_PREFIX = @GLIB_PREFIX@
-@@ -265,8 +263,6 @@
- SHELL = @SHELL@
- SOUP_CFLAGS = @SOUP_CFLAGS@
- SOUP_LIBS = @SOUP_LIBS@
--SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
--SSH_PATH = @SSH_PATH@
- STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
-@@ -336,7 +332,7 @@
+--- seahorse-2.28.0.orig/daemon/Makefile.in 2009-09-21 16:25:27.000000000 +0000
++++ seahorse-2.28.0/daemon/Makefile.in 2009-10-15 20:10:12.000000000 +0000
+@@ -265,8 +265,6 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+@@ -336,7 +334,7 @@
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
@@ -789,7 +794,7 @@
BUILT_SOURCES = \
seahorse-service-bindings.h \
-@@ -371,7 +367,7 @@
+@@ -371,7 +369,7 @@
man_MANS = seahorse-daemon.1
#autostart
@@ -800,8 +805,8 @@
EXTRA_DIST = \
Index: seahorse-2.28.0/data/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/data/Makefile.in 2009-09-21 18:25:27.000000000 +0200
-+++ seahorse-2.28.0/data/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/data/Makefile.in 2009-09-21 16:25:27.000000000 +0000
++++ seahorse-2.28.0/data/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -248,8 +248,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -813,8 +818,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/data/icons/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/data/icons/Makefile.in 2009-09-21 18:25:27.000000000 +0200
-+++ seahorse-2.28.0/data/icons/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/data/icons/Makefile.in 2009-09-21 16:25:27.000000000 +0000
++++ seahorse-2.28.0/data/icons/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -186,8 +186,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -826,8 +831,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/gkr/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/gkr/Makefile.in 2009-09-21 18:25:27.000000000 +0200
-+++ seahorse-2.28.0/gkr/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/gkr/Makefile.in 2009-09-21 16:25:27.000000000 +0000
++++ seahorse-2.28.0/gkr/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -247,8 +247,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -839,8 +844,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/help/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/help/Makefile.in 2009-09-21 18:25:27.000000000 +0200
-+++ seahorse-2.28.0/help/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/help/Makefile.in 2009-09-21 16:25:27.000000000 +0000
++++ seahorse-2.28.0/help/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -209,8 +209,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -852,8 +857,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/libcryptui/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/libcryptui/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/libcryptui/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/libcryptui/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/libcryptui/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -287,8 +287,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -865,8 +870,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/libcryptui/tests/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/libcryptui/tests/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/libcryptui/tests/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/libcryptui/tests/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/libcryptui/tests/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -217,8 +217,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -878,8 +883,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/libegg/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/libegg/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/libegg/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/libegg/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/libegg/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -239,8 +239,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -891,8 +896,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/libseahorse/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/libseahorse/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/libseahorse/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/libseahorse/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/libseahorse/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -281,8 +281,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -904,8 +909,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/pgp/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/pgp/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/pgp/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/pgp/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/pgp/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -294,8 +294,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -917,8 +922,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/pixmaps/22x22/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/pixmaps/22x22/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/pixmaps/22x22/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/pixmaps/22x22/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/pixmaps/22x22/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -208,8 +208,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -930,8 +935,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/pixmaps/48x48/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/pixmaps/48x48/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/pixmaps/48x48/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/pixmaps/48x48/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/pixmaps/48x48/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -208,8 +208,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -943,8 +948,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/pixmaps/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/pixmaps/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/pixmaps/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/pixmaps/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/pixmaps/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -224,8 +224,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -956,8 +961,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/pixmaps/scalable/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/pixmaps/scalable/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/pixmaps/scalable/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/pixmaps/scalable/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/pixmaps/scalable/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -208,8 +208,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -969,8 +974,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/pkcs11/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/pkcs11/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/pkcs11/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/pkcs11/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/pkcs11/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -245,8 +245,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -982,8 +987,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/reference/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/reference/Makefile.in 2009-09-21 18:25:28.000000000 +0200
-+++ seahorse-2.28.0/reference/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/reference/Makefile.in 2009-09-21 16:25:28.000000000 +0000
++++ seahorse-2.28.0/reference/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -224,8 +224,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -995,8 +1000,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/reference/libcryptui/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/reference/libcryptui/Makefile.in 2009-09-21 18:25:29.000000000 +0200
-+++ seahorse-2.28.0/reference/libcryptui/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/reference/libcryptui/Makefile.in 2009-09-21 16:25:29.000000000 +0000
++++ seahorse-2.28.0/reference/libcryptui/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -191,8 +191,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -1008,8 +1013,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/src/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/src/Makefile.in 2009-09-21 18:25:29.000000000 +0200
-+++ seahorse-2.28.0/src/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/src/Makefile.in 2009-09-21 16:25:29.000000000 +0000
++++ seahorse-2.28.0/src/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -269,8 +269,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -1021,8 +1026,8 @@
VERSION = @VERSION@
Index: seahorse-2.28.0/ssh/Makefile.in
===================================================================
---- seahorse-2.28.0.orig/ssh/Makefile.in 2009-09-21 18:25:29.000000000 +0200
-+++ seahorse-2.28.0/ssh/Makefile.in 2009-10-15 21:00:22.000000000 +0200
+--- seahorse-2.28.0.orig/ssh/Makefile.in 2009-09-21 16:25:29.000000000 +0000
++++ seahorse-2.28.0/ssh/Makefile.in 2009-10-15 20:10:12.000000000 +0000
@@ -257,8 +257,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
@@ -1032,3 +1037,16 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+Index: seahorse-2.28.0/reference/libseahorse/Makefile.in
+===================================================================
+--- seahorse-2.28.0.orig/reference/libseahorse/Makefile.in 2009-10-15 20:11:03.000000000 +0000
++++ seahorse-2.28.0/reference/libseahorse/Makefile.in 2009-10-15 20:10:53.000000000 +0000
+@@ -191,8 +191,6 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
More information about the pkg-gnome-commits
mailing list