r21938 - in /desktop/unstable/seahorse/debian: changelog control control.in patches/02_service_autostart.patch patches/90_autotools.patch patches/series
av-guest at users.alioth.debian.org
av-guest at users.alioth.debian.org
Thu Oct 15 20:36:10 UTC 2009
Author: av-guest
Date: Thu Oct 15 20:36:10 2009
New Revision: 21938
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21938
Log:
* New upstream release.
- Set usage flags during unattended key generation,
(Closes: #501085)
* debian/control.in:
- removed libglade2-dev B-D, as per configure.in
requirements.
* debian/patches/02_service_autostart.patch:
- removed, applied upstream
* debian/patches/90_autotools.patch:
- refreshed.
* debian/patches/series:
- refreshed
Removed:
desktop/unstable/seahorse/debian/patches/02_service_autostart.patch
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/patches/90_autotools.patch
desktop/unstable/seahorse/debian/patches/series
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=21938&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Thu Oct 15 20:36:10 2009
@@ -1,3 +1,20 @@
+seahorse (2.28.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Set usage flags during unattended key generation,
+ (Closes: #501085)
+ * debian/control.in:
+ - removed libglade2-dev B-D, as per configure.in
+ requirements.
+ * debian/patches/02_service_autostart.patch:
+ - removed, applied upstream
+ * debian/patches/90_autotools.patch:
+ - refreshed.
+ * debian/patches/series:
+ - refreshed
+
+ -- Andrea Veri <andrea.veri89 at gmail.com> Thu, 15 Oct 2009 11:58:45 +0200
+
seahorse (2.26.2-1) unstable; urgency=low
[ Andreas Moog ]
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=21938&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Thu Oct 15 20:36:10 2009
@@ -6,7 +6,6 @@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
- libglade2-dev,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
libgp11-dev (>= 2.25.5),
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=21938&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Thu Oct 15 20:36:10 2009
@@ -6,7 +6,6 @@
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
- libglade2-dev,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
libgp11-dev (>= 2.25.5),
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=21938&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:36:10 2009
@@ -4,10 +4,10 @@
autoconf
rm -rf autom4te.cache
-Index: seahorse-2.26.1/INSTALL
-===================================================================
---- seahorse-2.26.1.orig/INSTALL 2009-05-20 18:49:49.986455314 +0200
-+++ seahorse-2.26.1/INSTALL 2009-05-20 18:49:00.778446299 +0200
+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
@@ -1,16 +1,19 @@
Installation Instructions
*************************
@@ -15,7 +15,7 @@
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-+2006, 2007, 2008 Free Software Foundation, Inc.
++2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
@@ -32,7 +32,7 @@
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
-@@ -23,9 +26,9 @@ debugging `configure').
+@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
@@ -44,7 +44,7 @@
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
-@@ -35,20 +38,17 @@ some point `config.cache' contains resul
+@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
@@ -71,7 +71,7 @@
2. Type `make' to compile the package.
-@@ -67,42 +67,57 @@ The simplest way to compile this package
+@@ -67,42 +67,57 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
@@ -142,7 +142,7 @@
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
-@@ -125,7 +140,7 @@ option `--program-prefix=PREFIX' or `--p
+@@ -125,7 +140,7 @@
Optional Features
=================
@@ -151,7 +151,7 @@
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
-@@ -137,14 +152,36 @@ find the X include and library files aut
+@@ -137,14 +152,46 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
@@ -162,7 +162,7 @@
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
-+ ./configure CC="cc -Ae"
++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
@@ -176,6 +176,16 @@
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
++
++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++ On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'. It is recommended to use the following options:
++
++ ./configure --prefix=/boot/common
+
Specifying the System Type
==========================
@@ -193,7 +203,17 @@
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
-@@ -170,9 +207,9 @@ eventually be run) with `--host=TYPE'.
+@@ -152,7 +199,8 @@
+
+ where SYSTEM can have one of these forms:
+
+- OS KERNEL-OS
++ OS
++ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+ `config.sub' isn't included in this package, then this package doesn't
+@@ -170,9 +218,9 @@
Sharing Defaults
================
@@ -206,7 +226,7 @@
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
-@@ -181,7 +218,7 @@ A warning: not all `configure' scripts l
+@@ -181,7 +229,7 @@
Defining Variables
==================
@@ -215,7 +235,7 @@
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
-@@ -190,21 +227,29 @@ them in the `configure' command line, us
+@@ -190,21 +238,29 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
@@ -251,7 +271,7 @@
`--version'
`-V'
-@@ -231,6 +276,16 @@ configuration-related scripts to be exec
+@@ -231,6 +287,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
@@ -268,469 +288,102 @@
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
-Index: seahorse-2.26.1/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/Makefile.in 2009-05-20 18:49:49.862452531 +0200
-+++ seahorse-2.26.1/Makefile.in 2009-05-20 18:49:00.854944699 +0200
-@@ -206,8 +206,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/aclocal.m4
-===================================================================
---- seahorse-2.26.1.orig/aclocal.m4 2009-05-20 18:49:50.382950624 +0200
-+++ seahorse-2.26.1/aclocal.m4 2009-05-20 18:48:48.946947452 +0200
-@@ -977,61 +977,59 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--#serial 5
-+#serial 4
-
- # _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
-- # 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.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`AS_DIRNAME("$mf")`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`AS_DIRNAME(["$file"])`
-- AS_MKDIR_P([$dirpart/$fdir])
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-+[# 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
-+ # 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.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`AS_DIRNAME("$mf")`
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`AS_DIRNAME(["$file"])`
-+ AS_MKDIR_P([$dirpart/$fdir])
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
- done
--}
-+done
- ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-Index: seahorse-2.26.1/common/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/common/Makefile.in 2009-05-20 18:49:52.626950437 +0200
-+++ seahorse-2.26.1/common/Makefile.in 2009-05-20 18:48:58.582943794 +0200
-@@ -194,8 +194,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/config.guess
-===================================================================
---- seahorse-2.26.1.orig/config.guess 2009-05-20 18:49:50.262953326 +0200
-+++ seahorse-2.26.1/config.guess 2009-05-20 18:48:58.334449361 +0200
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
--timestamp='2008-01-23'
-+timestamp='2009-04-27'
-
- # 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
-@@ -324,6 +324,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7; exit ;;
- esac ;;
-+ s390x:SunOS:*:*)
-+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ exit ;;
- sun4H:SunOS:5.*:*)
- echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
-@@ -331,7 +334,20 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
- i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ 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 '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#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/[^.]*//'`
- exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
-@@ -796,7 +812,7 @@ EOF
- x86)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
-- EM64T | authenticamd)
-+ EM64T | authenticamd | genuineintel)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
- IA64)
-@@ -935,6 +951,9 @@ EOF
- 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
-@@ -985,9 +1004,6 @@ EOF
- 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.
-@@ -1102,8 +1118,11 @@ EOF
- pc:*:*:*)
- # Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
-- # the processor, so we play safe by assuming i386.
-- echo i386-pc-msdosdjgpp
-+ # the processor, so we play safe by assuming i586.
-+ # Note: whatever this is, it MUST be the same as what config.sub
-+ # prints for the "djgpp" host, or else GDB configury will decide that
-+ # this is a cross-build.
-+ echo i586-pc-msdosdjgpp
- exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
-@@ -1141,6 +1160,16 @@ EOF
- 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
-+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+ OS_REL='.3'
-+ test -r /etc/.relid \
-+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
- m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-@@ -1216,6 +1245,9 @@ EOF
- 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 ;;
-@@ -1324,6 +1356,9 @@ EOF
- i*86:rdos:*:*)
- echo ${UNAME_MACHINE}-pc-rdos
- exit ;;
-+ i*86:AROS:*:*)
-+ echo ${UNAME_MACHINE}-pc-aros
-+ exit ;;
- esac
-
- #echo '(No uname command or uname output not recognized.)' 1>&2
-Index: seahorse-2.26.1/config.sub
-===================================================================
---- seahorse-2.26.1.orig/config.sub 2009-05-20 18:49:50.130450236 +0200
-+++ seahorse-2.26.1/config.sub 2009-05-20 18:48:58.338447006 +0200
-@@ -4,7 +4,7 @@
- # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Free Software Foundation, Inc.
-
--timestamp='2008-01-16'
-+timestamp='2009-04-17'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -122,6 +122,7 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ kopensolaris*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
- basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -249,13 +250,16 @@ case $basic_machine in
- | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- | i370 | i860 | i960 | ia64 \
- | ip2k | iq2000 \
-+ | lm32 \
- | m32c | m32r | m32rle | m68000 | m68k | m88k \
-- | maxq | mb | microblaze | mcore | mep \
-+ | maxq | mb | microblaze | mcore | mep | metag \
- | mips | mipsbe | mipseb | mipsel | mipsle \
- | mips16 \
- | mips64 | mips64el \
-- | mips64vr | mips64vrel \
-+ | mips64octeon | mips64octeonel \
- | mips64orion | mips64orionel \
-+ | mips64r5900 | mips64r5900el \
-+ | mips64vr | mips64vrel \
- | mips64vr4100 | mips64vr4100el \
- | mips64vr4300 | mips64vr4300el \
- | mips64vr5000 | mips64vr5000el \
-@@ -268,6 +272,7 @@ case $basic_machine in
- | mipsisa64sr71k | mipsisa64sr71kel \
- | mipstx39 | mipstx39el \
- | mn10200 | mn10300 \
-+ | moxie \
- | mt \
- | msp430 \
- | nios | nios2 \
-@@ -277,7 +282,7 @@ case $basic_machine in
- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- | pyramid \
- | score \
-- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- | sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-@@ -286,7 +291,7 @@ case $basic_machine in
- | v850 | v850e \
- | we32k \
- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-- | z8k)
-+ | z8k | z80)
- basic_machine=$basic_machine-unknown
- ;;
- m6811 | m68hc11 | m6812 | m68hc12)
-@@ -329,14 +334,17 @@ case $basic_machine in
- | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- | i*86-* | i860-* | i960-* | ia64-* \
- | ip2k-* | iq2000-* \
-+ | lm32-* \
- | m32c-* | m32r-* | m32rle-* \
- | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-- | m88110-* | m88k-* | maxq-* | mcore-* \
-+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
- | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- | mips16-* \
- | mips64-* | mips64el-* \
-- | mips64vr-* | mips64vrel-* \
-+ | mips64octeon-* | mips64octeonel-* \
- | mips64orion-* | mips64orionel-* \
-+ | mips64r5900-* | mips64r5900el-* \
-+ | mips64vr-* | mips64vrel-* \
- | mips64vr4100-* | mips64vr4100el-* \
- | mips64vr4300-* | mips64vr4300el-* \
- | mips64vr5000-* | mips64vr5000el-* \
-@@ -358,20 +366,20 @@ case $basic_machine in
- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
- | pyramid-* \
- | romp-* | rs6000-* \
-- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
- | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
- | sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- | tahoe-* | thumb-* \
-- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- | tron-* \
- | v850-* | v850e-* | vax-* \
- | we32k-* \
- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa*-* \
- | ymp-* \
-- | z8k-*)
-+ | z8k-* | z80-*)
- ;;
- # Recognize the basic CPU types without company name, with glob match.
- xtensa*)
-@@ -439,6 +447,10 @@ case $basic_machine in
- basic_machine=m68k-apollo
- os=-bsd
- ;;
-+ aros)
-+ basic_machine=i386-pc
-+ os=-aros
-+ ;;
- aux)
- basic_machine=m68k-apple
- os=-aux
-@@ -459,6 +471,10 @@ case $basic_machine in
- basic_machine=c90-cray
- os=-unicos
- ;;
-+ cegcc)
-+ basic_machine=arm-unknown
-+ os=-cegcc
-+ ;;
- convex-c1)
- basic_machine=c1-convex
- os=-bsd
-@@ -526,6 +542,10 @@ case $basic_machine in
- basic_machine=m88k-motorola
- os=-sysv3
- ;;
-+ dicos)
-+ basic_machine=i686-pc
-+ os=-dicos
-+ ;;
- djgpp)
- basic_machine=i586-pc
- os=-msdosdjgpp
-@@ -1128,6 +1148,10 @@ case $basic_machine in
- basic_machine=z8k-unknown
- os=-sim
- ;;
-+ z80-*-coff)
-+ basic_machine=z80-unknown
-+ os=-sim
-+ ;;
- none)
- basic_machine=none-none
- os=-none
-@@ -1166,7 +1190,7 @@ case $basic_machine in
- we32k)
- basic_machine=we32k-att
- ;;
-- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
- basic_machine=sh-unknown
- ;;
- sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-@@ -1238,8 +1262,9 @@ case $os in
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+ | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-- | -aos* \
-+ | -aos* | -aros* \
- | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-@@ -1248,7 +1273,7 @@ case $os in
- | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-- | -chorusos* | -chorusrdb* \
-+ | -chorusos* | -chorusrdb* | -cegcc* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1388,6 +1413,9 @@ case $os in
- -zvmoe)
- os=-zvmoe
- ;;
-+ -dicos*)
-+ os=-dicos
-+ ;;
- -none)
- ;;
- *)
-Index: seahorse-2.26.1/configure
-===================================================================
---- seahorse-2.26.1.orig/configure 2009-04-12 16:33:21.000000000 +0200
-+++ seahorse-2.26.1/configure 2009-05-20 18:49:38.458443606 +0200
-@@ -818,8 +818,6 @@ WITH_TESTS_FALSE
+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
+@@ -245,8 +245,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/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@
+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
+@@ -773,8 +773,6 @@
WITH_TESTS_TRUE
WITH_SSH_FALSE
WITH_SSH_TRUE
@@ -739,167 +392,256 @@
WITH_PKCS11_FALSE
WITH_PKCS11_TRUE
GP11_LIBS
-@@ -5759,13 +5757,13 @@ if test "${lt_cv_nm_interface+set}" = se
+@@ -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 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5762: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5760: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5849: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5834: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5765: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5763: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5852: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5837: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5768: output\"" >&5)
-+ (eval echo "\"\$as_me:5766: output\"" >&5)
+- (eval echo "\"\$as_me:5855: output\"" >&5)
++ (eval echo "\"\$as_me:5840: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6970,7 +6968,7 @@ ia64-*-hpux*)
+@@ -7057,7 +7042,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6973 "configure"' > conftest.$ac_ext
-+ echo '#line 6971 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+- echo '#line 7060 "configure"' > conftest.$ac_ext
++ echo '#line 7045 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9546,11 +9544,11 @@ else
+@@ -9114,11 +9099,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:9549: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9547: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9117: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9102: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9553: \$? = $ac_status" >&5
-+ echo "$as_me:9551: \$? = $ac_status" >&5
+- echo "$as_me:9121: \$? = $ac_status" >&5
++ echo "$as_me:9106: \$? = $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.
-@@ -9885,11 +9883,11 @@ else
+@@ -9453,11 +9438,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:9888: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9886: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9456: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9441: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9892: \$? = $ac_status" >&5
-+ echo "$as_me:9890: \$? = $ac_status" >&5
+- echo "$as_me:9460: \$? = $ac_status" >&5
++ echo "$as_me:9445: \$? = $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.
-@@ -9990,11 +9988,11 @@ else
+@@ -9558,11 +9543,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:9993: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9991: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9561: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:9997: \$? = $ac_status" >&5
-+ echo "$as_me:9995: \$? = $ac_status" >&5
+- echo "$as_me:9565: \$? = $ac_status" >&5
++ echo "$as_me:9550: \$? = $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
-@@ -10045,11 +10043,11 @@ else
+@@ -9613,11 +9598,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:10048: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10046: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9601: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:10052: \$? = $ac_status" >&5
-+ echo "$as_me:10050: \$? = $ac_status" >&5
+- echo "$as_me:9620: \$? = $ac_status" >&5
++ echo "$as_me:9605: \$? = $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
-@@ -10164,6 +10162,9 @@ $as_echo_n "checking whether the $compil
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ link_all_deplibs=no
-+ ;;
- esac
-
- ld_shlibs=yes
-@@ -12858,7 +12859,7 @@ else
+@@ -11996,7 +11981,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12861 "configure"
-+#line 12862 "configure"
+-#line 11999 "configure"
++#line 11984 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12954,7 +12955,7 @@ else
+@@ -12092,7 +12077,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12957 "configure"
-+#line 12958 "configure"
+-#line 12095 "configure"
++#line 12080 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14974,11 +14975,11 @@ else
+@@ -14048,11 +14033,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:14977: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14978: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14051: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14981: \$? = $ac_status" >&5
-+ echo "$as_me:14982: \$? = $ac_status" >&5
+- echo "$as_me:14055: \$? = $ac_status" >&5
++ echo "$as_me:14040: \$? = $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.
-@@ -15073,11 +15074,11 @@ else
+@@ -14147,11 +14132,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:15076: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15077: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14150: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14135: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15080: \$? = $ac_status" >&5
-+ echo "$as_me:15081: \$? = $ac_status" >&5
+- echo "$as_me:14154: \$? = $ac_status" >&5
++ echo "$as_me:14139: \$? = $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
-@@ -15125,11 +15126,11 @@ else
+@@ -14199,11 +14184,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:15128: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15129: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14202: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14187: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:15132: \$? = $ac_status" >&5
-+ echo "$as_me:15133: \$? = $ac_status" >&5
+- echo "$as_me:14206: \$? = $ac_status" >&5
++ echo "$as_me:14191: \$? = $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
-@@ -19047,91 +19048,11 @@ if test "x$enable_ssh" = "xno"; then
+@@ -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 @@
echo "disabling ssh support"
else
- # Extract the first word of "ssh-keygen", so it can be a program name with args.
-set dummy ssh-keygen; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_SSH_KEYGEN_PATH+set}" = set; then
+-if test "${ac_cv_path_SSH_KEYGEN_PATH+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $SSH_KEYGEN_PATH in
@@ -912,14 +654,14 @@
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SSH_KEYGEN_PATH="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
--done
+- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed""
@@ -928,19 +670,19 @@
-fi
-SSH_KEYGEN_PATH=$ac_cv_path_SSH_KEYGEN_PATH
-if test -n "$SSH_KEYGEN_PATH"; then
-- { $as_echo "$as_me:$LINENO: result: $SSH_KEYGEN_PATH" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSH_KEYGEN_PATH" >&5
-$as_echo "$SSH_KEYGEN_PATH" >&6; }
-else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "ssh", so it can be a program name with args.
-set dummy ssh; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_SSH_PATH+set}" = set; then
+-if test "${ac_cv_path_SSH_PATH+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- case $SSH_PATH in
@@ -953,14 +695,14 @@
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
+- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SSH_PATH="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
--done
+- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_SSH_PATH" && ac_cv_path_SSH_PATH=""failed""
@@ -969,10 +711,10 @@
-fi
-SSH_PATH=$ac_cv_path_SSH_PATH
-if test -n "$SSH_PATH"; then
-- { $as_echo "$as_me:$LINENO: result: $SSH_PATH" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SSH_PATH" >&5
-$as_echo "$SSH_PATH" >&6; }
-else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
@@ -986,8 +728,7 @@
+# test $SSH_PATH != "failed"; then
enable_ssh="yes"
- cat >>confdefs.h <<\_ACEOF
-@@ -19140,15 +19061,15 @@ _ACEOF
+ $as_echo "#define WITH_SSH 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
@@ -1006,145 +747,40 @@
fi
-@@ -23039,28 +22960,27 @@ $as_echo "$as_me: executing $ac_file com
-
-
- 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
-- # 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.
-- # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
-- # Grep'ing the whole file is not good either: AIX grep has a line
-- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-- dirpart=`$as_dirname -- "$mf" ||
-+ "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
-+ # 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.
-+ # We used to match only the files named `Makefile.in', but
-+ # some people rename them; so instead we look at the file content.
-+ # Grep'ing the first line is not enough: some people post-process
-+ # each Makefile.in and add a new line on top of each file to say so.
-+ # Grep'ing the whole file is not good either: AIX grep has a line
-+ # limit of 2048, but all sed's we know have understand at least 4000.
-+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
- X"$mf" : 'X\(//\)$' \| \
-@@ -23083,28 +23003,28 @@ $as_echo X"$mf" |
- q
- }
- s/.*/./; q'`
-- else
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
-- # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
-- test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-- # When using ansi2knr, U may be empty or an underscore; expand it
-- U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`$as_dirname -- "$file" ||
-+ else
-+ continue
-+ fi
-+ # Extract the definition of DEPDIR, am__include, and am__quote
-+ # from the Makefile without running `make'.
-+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+ test -z "$DEPDIR" && continue
-+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+ test -z "am__include" && continue
-+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+ # When using ansi2knr, U may be empty or an underscore; expand it
-+ U=`sed -n 's/^U = //p' < "$mf"`
-+ # Find all dependency output files, they are included files with
-+ # $(DEPDIR) in their names. We invoke sed twice because it is the
-+ # simplest approach to changing $(DEPDIR) to its actual value in the
-+ # expansion.
-+ for file in `sed -n "
-+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+ # Make sure the directory exists.
-+ test -f "$dirpart/$file" && continue
-+ fdir=`$as_dirname -- "$file" ||
- $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$file" : 'X\(//\)[^/]' \| \
- X"$file" : 'X\(//\)$' \| \
-@@ -23127,7 +23047,7 @@ $as_echo X"$file" |
- q
- }
- s/.*/./; q'`
-- { as_dir=$dirpart/$fdir
-+ { as_dir=$dirpart/$fdir
- case $as_dir in #(
- -*) as_dir=./$as_dir;;
- esac
-@@ -23168,11 +23088,10 @@ $as_echo X"$as_dir" |
- } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
- $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
-- # echo "creating $dirpart/$file"
-- echo '# dummy' > "$dirpart/$file"
-- done
-+ # echo "creating $dirpart/$file"
-+ echo '# dummy' > "$dirpart/$file"
- done
--}
-+done
- ;;
- "libtool":C)
-
-Index: seahorse-2.26.1/daemon/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/daemon/Makefile.in 2009-05-20 18:49:54.330448781 +0200
-+++ seahorse-2.26.1/daemon/Makefile.in 2009-05-20 18:48:58.734943775 +0200
-@@ -233,8 +233,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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@
-@@ -306,7 +304,7 @@ INCLUDES = -I$(top_builddir) \
+@@ -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 @@
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
@@ -1153,8 +789,8 @@
BUILT_SOURCES = \
seahorse-service-bindings.h \
-@@ -342,7 +340,7 @@ man_MANS = seahorse-daemon.1
- glade_DATA =
+@@ -371,7 +367,7 @@
+ man_MANS = seahorse-daemon.1
#autostart
-desktopdir = $(sysconfdir)/xdg/autostart
@@ -1162,311 +798,237 @@
desktop_in_files = seahorse-daemon.desktop.in
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
EXTRA_DIST = \
-Index: seahorse-2.26.1/data/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/data/Makefile.in 2009-05-20 18:49:52.958952470 +0200
-+++ seahorse-2.26.1/data/Makefile.in 2009-05-20 18:48:58.838945602 +0200
-@@ -195,8 +195,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/data/icons/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/data/icons/Makefile.in 2009-05-20 18:49:53.066453287 +0200
-+++ seahorse-2.26.1/data/icons/Makefile.in 2009-05-20 18:48:58.926943653 +0200
-@@ -175,8 +175,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/gkr/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/gkr/Makefile.in 2009-05-20 18:49:54.902447871 +0200
-+++ seahorse-2.26.1/gkr/Makefile.in 2009-05-20 18:48:59.042944294 +0200
-@@ -210,8 +210,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/help/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/help/Makefile.in 2009-05-20 18:49:54.074951993 +0200
-+++ seahorse-2.26.1/help/Makefile.in 2009-05-20 18:48:59.162944052 +0200
-@@ -198,8 +198,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/libcryptui/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/libcryptui/Makefile.in 2009-05-20 18:49:51.934452917 +0200
-+++ seahorse-2.26.1/libcryptui/Makefile.in 2009-05-20 18:48:59.294944554 +0200
-@@ -225,8 +225,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/libcryptui/tests/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/libcryptui/tests/Makefile.in 2009-05-20 18:49:52.054447291 +0200
-+++ seahorse-2.26.1/libcryptui/tests/Makefile.in 2009-05-20 18:48:59.402944513 +0200
-@@ -195,8 +195,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/libegg/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/libegg/Makefile.in 2009-05-20 18:49:52.226449189 +0200
-+++ seahorse-2.26.1/libegg/Makefile.in 2009-05-20 18:48:59.542944713 +0200
-@@ -217,8 +217,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/libseahorse/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/libseahorse/Makefile.in 2009-05-20 18:49:50.610450220 +0200
-+++ seahorse-2.26.1/libseahorse/Makefile.in 2009-05-20 18:48:59.670944161 +0200
-@@ -245,8 +245,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/ltmain.sh
-===================================================================
---- seahorse-2.26.1.orig/ltmain.sh 2009-05-20 18:49:50.498451132 +0200
-+++ seahorse-2.26.1/ltmain.sh 2009-05-20 18:48:37.862449409 +0200
-@@ -65,7 +65,7 @@
- # compiler: $LTCC
- # compiler flags: $LTCFLAGS
- # linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
- # automake: $automake_version
- # autoconf: $autoconf_version
- #
-@@ -73,7 +73,7 @@
-
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION="2.2.6 Debian-2.2.6a-1ubuntu1"
-+VERSION="2.2.6 Debian-2.2.6a-4"
- TIMESTAMP=""
- package_revision=1.3012
-
-@@ -5347,19 +5347,19 @@ func_mode_link ()
- # It is a libtool convenience library, so add in its objects.
- convenience="$convenience $ladir/$objdir/$old_library"
- old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+ tmp_libs=
-+ for deplib in $dependency_libs; do
-+ deplibs="$deplib $deplibs"
-+ if $opt_duplicate_deps ; then
-+ case "$tmp_libs " in
-+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+ esac
-+ fi
-+ tmp_libs="$tmp_libs $deplib"
-+ done
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
- fi
-- tmp_libs=
-- for deplib in $dependency_libs; do
-- deplibs="$deplib $deplibs"
-- if $opt_duplicate_deps ; then
-- case "$tmp_libs " in
-- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-- esac
-- fi
-- tmp_libs="$tmp_libs $deplib"
-- done
- continue
- fi # $pass = conv
-
-@@ -5896,6 +5896,7 @@ func_mode_link ()
- if test "$link_all_deplibs" != no; then
- # Add the search paths of all dependency libraries
- for deplib in $dependency_libs; do
-+ path=
- case $deplib in
- -L*) path="$deplib" ;;
- *.la)
-Index: seahorse-2.26.1/m4/libtool.m4
-===================================================================
---- seahorse-2.26.1.orig/m4/libtool.m4 2009-05-20 18:49:52.810950635 +0200
-+++ seahorse-2.26.1/m4/libtool.m4 2009-05-20 18:48:38.042445128 +0200
-@@ -4261,6 +4261,9 @@ dnl Note also adjust exclude_expsyms for
- openbsd*)
- with_gnu_ld=no
- ;;
-+ linux* | k*bsd*-gnu)
-+ _LT_TAGVAR(link_all_deplibs, $1)=no
-+ ;;
- esac
-
- _LT_TAGVAR(ld_shlibs, $1)=yes
-Index: seahorse-2.26.1/pgp/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/pgp/Makefile.in 2009-05-20 18:49:54.526450227 +0200
-+++ seahorse-2.26.1/pgp/Makefile.in 2009-05-20 18:48:59.810945328 +0200
-@@ -259,8 +259,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/pixmaps/22x22/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/pixmaps/22x22/Makefile.in 2009-05-20 18:49:53.866945875 +0200
-+++ seahorse-2.26.1/pixmaps/22x22/Makefile.in 2009-05-20 18:48:59.898943865 +0200
-@@ -183,8 +183,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/pixmaps/48x48/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/pixmaps/48x48/Makefile.in 2009-05-20 18:49:53.538453568 +0200
-+++ seahorse-2.26.1/pixmaps/48x48/Makefile.in 2009-05-20 18:48:59.986944857 +0200
-@@ -183,8 +183,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/pixmaps/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/pixmaps/Makefile.in 2009-05-20 18:49:53.426452039 +0200
-+++ seahorse-2.26.1/pixmaps/Makefile.in 2009-05-20 18:49:00.078944473 +0200
-@@ -185,8 +185,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/pixmaps/scalable/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/pixmaps/scalable/Makefile.in 2009-05-20 18:49:53.694452176 +0200
-+++ seahorse-2.26.1/pixmaps/scalable/Makefile.in 2009-05-20 18:49:00.166944002 +0200
-@@ -183,8 +183,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/pkcs11/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/pkcs11/Makefile.in 2009-05-20 18:49:53.242447940 +0200
-+++ seahorse-2.26.1/pkcs11/Makefile.in 2009-05-20 18:49:00.282943658 +0200
-@@ -209,8 +209,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/reference/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/reference/Makefile.in 2009-05-20 18:49:51.514452822 +0200
-+++ seahorse-2.26.1/reference/Makefile.in 2009-05-20 18:49:00.374444105 +0200
-@@ -185,8 +185,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/reference/libcryptui/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/reference/libcryptui/Makefile.in 2009-05-20 18:49:51.626450443 +0200
-+++ seahorse-2.26.1/reference/libcryptui/Makefile.in 2009-05-20 18:49:00.478446920 +0200
-@@ -180,8 +180,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/src/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/src/Makefile.in 2009-05-20 18:49:52.378451597 +0200
-+++ seahorse-2.26.1/src/Makefile.in 2009-05-20 18:49:00.610445476 +0200
-@@ -235,8 +235,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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.26.1/ssh/Makefile.in
-===================================================================
---- seahorse-2.26.1.orig/ssh/Makefile.in 2009-05-20 18:49:51.314455201 +0200
-+++ seahorse-2.26.1/ssh/Makefile.in 2009-05-20 18:49:00.738444429 +0200
-@@ -222,8 +222,6 @@ SHARING_LIBS = @SHARING_LIBS@
- 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/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
+@@ -248,8 +248,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/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
+@@ -186,8 +186,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/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
+@@ -247,8 +247,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/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
+@@ -209,8 +209,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/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
+@@ -287,8 +287,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/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
+@@ -217,8 +217,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/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
+@@ -239,8 +239,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/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
+@@ -281,8 +281,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/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
+@@ -294,8 +294,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/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
+@@ -208,8 +208,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/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
+@@ -208,8 +208,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/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
+@@ -224,8 +224,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/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
+@@ -208,8 +208,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/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
+@@ -245,8 +245,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/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
+@@ -224,8 +224,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/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
+@@ -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@
+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
+@@ -269,8 +269,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/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
+@@ -257,8 +257,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@
Modified: desktop/unstable/seahorse/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=21938&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series [utf-8] Thu Oct 15 20:36:10 2009
@@ -1,5 +1,4 @@
01_autostart_path.patch
-02_service_autostart.patch
08_force_ssh.patch
90_autotools.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list