r23746 - in /desktop/unstable/seahorse/debian: changelog control control.in patches/01_autostart_path.patch patches/02_maxpathlen_hurd.patch patches/90_autotools.patch patches/series
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Mon Apr 12 15:26:53 UTC 2010
Author: slomo
Date: Mon Apr 12 15:26:49 2010
New Revision: 23746
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23746
Log:
* New upstream stable release:
+ debian/patches/02_maxpathlen_hurd.patch:
- Dropped, merged upstream.
+ debian/control.in:
- Update build dependencies.
+ debian/patches/90_autotools.patch:
- Regenerated for the new version.
Removed:
desktop/unstable/seahorse/debian/patches/02_maxpathlen_hurd.patch
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/patches/01_autostart_path.patch
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=23746&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog [utf-8] (original)
+++ desktop/unstable/seahorse/debian/changelog [utf-8] Mon Apr 12 15:26:49 2010
@@ -1,5 +1,6 @@
-seahorse (2.28.1-2) UNRELEASED; urgency=low
-
+seahorse (2.30.0-1) unstable; urgency=low
+
+ [ Emilio Pozuelo Monfort ]
* debian/patches/02_maxpathlen_hurd.patch:
- Fix FTBFS on the Hurd: don't hardcode the GPG homedir length to
MAXPATHLEN, use dynamic allocation instead.
@@ -7,7 +8,16 @@
- Stop build depending on libxml2-dev, it's needed for the epiphany
plugin which is now in seahorse-plugins.
- -- Emilio Pozuelo Monfort <pochu at debian.org> Sun, 13 Dec 2009 19:18:32 +0100
+ [ Sebastian Dröge ]
+ * New upstream stable release:
+ + debian/patches/02_maxpathlen_hurd.patch:
+ - Dropped, merged upstream.
+ + debian/control.in:
+ - Update build dependencies.
+ + debian/patches/90_autotools.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 12 Apr 2010 17:14:26 +0200
seahorse (2.28.1-1) unstable; urgency=low
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=23746&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control [utf-8] Mon Apr 12 15:26:49 2010
@@ -7,13 +7,13 @@
Section: gnome
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Andrea Veri <andrea.veri89 at gmail.com>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
- libgp11-dev (>= 2.25.5),
+ libgp11-dev (>= 2.29.4),
libgcr-dev (>= 2.25.5),
intltool (>= 0.35),
libsoup2.4-dev,
@@ -26,11 +26,11 @@
gtk-doc-tools (>= 1.9),
libgnome-keyring-dev (>= 2.25.5),
libglib2.0-dev (>= 2.10.0),
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.18.0),
libgconf2-dev,
gnome-pkg-tools
Build-Conflicts: gnupg2
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Package: seahorse
Architecture: any
@@ -66,7 +66,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libglib2.0-dev (>= 2.10.0),
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.18.0),
libgconf2-dev,
libcryptui0 (= ${binary:Version})
Section: libdevel
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=23746&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in [utf-8] (original)
+++ desktop/unstable/seahorse/debian/control.in [utf-8] Mon Apr 12 15:26:49 2010
@@ -8,7 +8,7 @@
quilt,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
- libgp11-dev (>= 2.25.5),
+ libgp11-dev (>= 2.29.4),
libgcr-dev (>= 2.25.5),
intltool (>= 0.35),
libsoup2.4-dev,
@@ -21,11 +21,11 @@
gtk-doc-tools (>= 1.9),
libgnome-keyring-dev (>= 2.25.5),
libglib2.0-dev (>= 2.10.0),
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.18.0),
libgconf2-dev,
gnome-pkg-tools
Build-Conflicts: gnupg2
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Package: seahorse
Architecture: any
@@ -61,7 +61,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libglib2.0-dev (>= 2.10.0),
- libgtk2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.18.0),
libgconf2-dev,
libcryptui0 (= ${binary:Version})
Section: libdevel
Modified: desktop/unstable/seahorse/debian/patches/01_autostart_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/01_autostart_path.patch?rev=23746&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/01_autostart_path.patch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/01_autostart_path.patch [utf-8] Mon Apr 12 15:26:49 2010
@@ -11,12 +11,3 @@
bin_PROGRAMS = seahorse-daemon
-@@ -66,7 +66,7 @@ man_MANS = seahorse-daemon.1
- glade_DATA =
-
- #autostart
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/gnome/autostart
- desktop_in_files = seahorse-daemon.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
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=23746&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/90_autotools.patch [utf-8] Mon Apr 12 15:26:49 2010
@@ -1,298 +1,60 @@
-libtoolize --force --copy
-aclocal -I m4
-automake -acf -Wno-portability
-autoconf
-rm -rf autom4te.cache
-
-Index: seahorse-2.28.0/INSTALL
-===================================================================
---- 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
- *************************
-
--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, 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
- unlimited permission to copy, distribute and modify it.
-
- Basic Installation
- ==================
-
--These are generic installation instructions.
-+ Briefly, the shell commands `./configure; make; make install' should
-+configure, build, and install this package. The following
-+more-detailed instructions are generic; see the `README' file for
-+instructions specific to this package.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -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
--the results of its tests to speed up reconfiguring. (Caching is
-+the results of its tests to speed up reconfiguring. Caching is
- disabled by default to prevent problems with accidental use of stale
--cache files.)
-+cache files.
-
- 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 @@
- may remove or edit it.
-
- The file `configure.ac' (or `configure.in') is used to create
--`configure' by a program called `autoconf'. You only need
--`configure.ac' if you want to change it or regenerate `configure' using
--a newer version of `autoconf'.
-+`configure' by a program called `autoconf'. You need `configure.ac' if
-+you want to change it or regenerate `configure' using a newer version
-+of `autoconf'.
-
- The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
-- `./configure' to configure the package for your system. If you're
-- using `csh' on an old version of System V, you might need to type
-- `sh ./configure' instead to prevent `csh' from trying to execute
-- `configure' itself.
-+ `./configure' to configure the package for your system.
-
-- Running `configure' takes awhile. While running, it prints some
-- messages telling which features it is checking for.
-+ Running `configure' might take a while. While running, it prints
-+ some messages telling which features it is checking for.
-
- 2. Type `make' to compile the package.
-
-@@ -67,42 +67,57 @@
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-+ 6. Often, you can also type `make uninstall' to remove the installed
-+ files again.
-+
- Compilers and Options
- =====================
-
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about. Run `./configure --help' for
--details on some of the pertinent environment variables.
-+ Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about. Run `./configure --help'
-+for details on some of the pertinent environment variables.
-
- You can give `configure' initial values for configuration parameters
- by setting variables in the command line or in the environment. Here
- is an example:
-
-- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
-+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
-
- *Note Defining Variables::, for more details.
-
- Compiling For Multiple Architectures
- ====================================
-
--You can compile the package for more than one kind of computer at the
-+ You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
--own directory. To do this, you must use a version of `make' that
--supports the `VPATH' variable, such as GNU `make'. `cd' to the
-+own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
- source code in the directory that `configure' is in and in `..'.
-
-- If you have to use a `make' that does not support the `VPATH'
--variable, you have to compile the package for one architecture at a
--time in the source code directory. After you have installed the
--package for one architecture, use `make distclean' before reconfiguring
--for another architecture.
-+ With a non-GNU `make', it is safer to compile the package for one
-+architecture at a time in the source code directory. After you have
-+installed the package for one architecture, use `make distclean' before
-+reconfiguring for another architecture.
-+
-+ On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor. Like
-+this:
-+
-+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+ CPP="gcc -E" CXXCPP="g++ -E"
-+
-+ This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-
- Installation Names
- ==================
-
--By default, `make install' installs the package's commands under
-+ By default, `make install' installs the package's commands under
- `/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 @@
- Optional Features
- =================
-
--Some packages pay attention to `--enable-FEATURE' options to
-+ Some packages pay attention to `--enable-FEATURE' options to
- `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,46 @@
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+Particular systems
-+==================
-+
-+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
-+a workaround. If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+ ./configure CC="cc"
-+
-+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
- ==========================
-
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+ There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on. Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--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:
-
-@@ -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
- ================
-
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+ If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `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 +229,7 @@
- Defining Variables
- ==================
-
--Variables not defined in a site shell script can be set in the
-+ Variables not defined in a site shell script can be set in the
- 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 +238,29 @@
- ./configure CC=/usr/local2/bin/gcc
-
- causes the specified `gcc' to be used as the C compiler (unless it is
--overridden in the site shell script). Here is a another example:
-+overridden in the site shell script).
-
-- /bin/bash ./configure CONFIG_SHELL=/bin/bash
-+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-+an Autoconf bug. Until the bug is fixed you can use this workaround:
-
--Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
--configuration-related scripts to be executed by `/bin/bash'.
-+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
-
- `configure' Invocation
- ======================
-
--`configure' recognizes the following options to control how it operates.
-+ `configure' recognizes the following options to control how it
-+operates.
-
- `--help'
- `-h'
-- Print a summary of the options to `configure', and exit.
-+ Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+ Print a summary of the options unique to this package's
-+ `configure', and exit. The `short' variant lists options used
-+ only in the top level, while the `recursive' variant lists options
-+ also present in any nested packages.
-
- `--version'
- `-V'
-@@ -231,6 +287,16 @@
- Look for the package's source code in directory DIR. Usually
- `configure' can determine that directory automatically.
-
-+`--prefix=DIR'
-+ Use DIR as the installation prefix. *Note Installation Names::
-+ for more details, including other options available for fine-tuning
-+ the installation locations.
-+
-+`--no-create'
-+`-n'
-+ Run the configure checks, but stop before creating any output
-+ files.
-+
- `configure' also accepts some other, not widely useful, options. Run
- `configure --help' for more details.
-
-Index: seahorse-2.28.0/Makefile.in
-===================================================================
---- 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 @@
+diff -Naur seahorse-2.30.0.old/aclocal.m4 seahorse-2.30.0/aclocal.m4
+--- seahorse-2.30.0.old/aclocal.m4 2010-03-31 01:03:20.000000000 +0200
++++ seahorse-2.30.0/aclocal.m4 2010-04-12 17:21:31.673531686 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.11 -*- Autoconf -*-
++# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+@@ -13,8 +13,8 @@
+
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
+-[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
+ You have another version of autoconf. It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+@@ -702,7 +702,7 @@
+ [am__api_version='1.11'
+ dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+ dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11], [],
++m4_if([$1], [1.11.1], [],
+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+@@ -718,7 +718,7 @@
+ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11])dnl
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
+ m4_ifndef([AC_AUTOCONF_VERSION],
+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+diff -Naur seahorse-2.30.0.old/common/Makefile.in seahorse-2.30.0/common/Makefile.in
+--- seahorse-2.30.0.old/common/Makefile.in 2010-03-31 01:03:22.000000000 +0200
++++ seahorse-2.30.0/common/Makefile.in 2010-04-12 17:21:33.860530035 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -147,6 +147,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -223,8 +225,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -301,213 +63,36 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-Index: seahorse-2.28.0/common/Makefile.in
-===================================================================
---- 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 @@
+diff -Naur seahorse-2.30.0.old/configure seahorse-2.30.0/configure
+--- seahorse-2.30.0.old/configure 2010-03-31 01:03:21.000000000 +0200
++++ seahorse-2.30.0/configure 2010-04-12 17:21:32.732530878 +0200
+@@ -1,10 +1,12 @@
#! /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 16:25:26.000000000 +0000
-+++ seahorse-2.28.0/configure 2009-10-15 20:10:59.000000000 +0000
-@@ -773,8 +773,6 @@
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.64 for seahorse 2.30.0.
++# Generated by GNU Autoconf 2.65 for seahorse 2.30.0.
++#
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
+-# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+ #
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+@@ -673,7 +675,8 @@
+
+
+
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -782,8 +785,6 @@
WITH_TESTS_TRUE
WITH_SSH_FALSE
WITH_SSH_TRUE
@@ -516,149 +101,868 @@
WITH_PKCS11_FALSE
WITH_PKCS11_TRUE
GP11_LIBS
-@@ -5846,13 +5844,13 @@
+@@ -821,12 +822,20 @@
+ SEAHORSE_CFLAGS
+ GTK_LIBS
+ GTK_CFLAGS
++GTK_DOC_USE_REBASE_FALSE
++GTK_DOC_USE_REBASE_TRUE
+ GTK_DOC_USE_LIBTOOL_FALSE
+ GTK_DOC_USE_LIBTOOL_TRUE
++GTK_DOC_BUILD_PDF_FALSE
++GTK_DOC_BUILD_PDF_TRUE
++GTK_DOC_BUILD_HTML_FALSE
++GTK_DOC_BUILD_HTML_TRUE
+ ENABLE_GTK_DOC_FALSE
+ ENABLE_GTK_DOC_TRUE
+-GTKDOC_CHECK
+ HTML_DIR
++GTKDOC_MKPDF
++GTKDOC_REBASE
++GTKDOC_CHECK
+ HAVE_GNOME_DOC_UTILS_FALSE
+ HAVE_GNOME_DOC_UTILS_TRUE
+ DISTCHECK_CONFIGURE_FLAGS
+@@ -1009,6 +1018,8 @@
+ enable_scrollkeeper
+ with_html_dir
+ enable_gtk_doc
++enable_gtk_doc_html
++enable_gtk_doc_pdf
+ enable_largefile
+ enable_pgp
+ enable_gpg_check
+@@ -1694,7 +1705,9 @@
+ --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]
++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
++ --enable-gtk-doc-html build documentation in html format [[default=yes]]
++ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
+ --disable-largefile omit support for large files
+ --enable-pgp enable PGP support (default is auto)
+ --disable-gpg-check check GPG version (default is yes)
+@@ -1736,7 +1749,7 @@
+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
+ nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CXX C++ compiler command
+ CXXFLAGS C++ compiler flags
+@@ -1845,7 +1858,7 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ seahorse configure 2.30.0
+-generated by GNU Autoconf 2.64
++generated by GNU Autoconf 2.65
+
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+@@ -1892,7 +1905,7 @@
+ ac_retval=1
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_compile
+
+@@ -1930,7 +1943,7 @@
+ ac_retval=1
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_cxx_try_compile
+
+@@ -1976,7 +1989,7 @@
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_link
+
+@@ -2111,7 +2124,7 @@
+ ac_retval=1
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_cpp
+
+@@ -2153,7 +2166,7 @@
+ fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_c_try_run
+
+@@ -2190,7 +2203,7 @@
+ ac_retval=1
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_cxx_try_cpp
+
+@@ -2236,7 +2249,7 @@
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+- return $ac_retval
++ as_fn_set_status $ac_retval
+
+ } # ac_fn_cxx_try_link
+
+@@ -2385,7 +2398,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+
+ It was created by seahorse $as_me 2.30.0, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ $ $0 $@
+
+@@ -2638,7 +2651,7 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+ test "x$ac_site_file" = xNONE && continue
+- if test -r "$ac_site_file"; then
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+@@ -2647,9 +2660,9 @@
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+@@ -3076,6 +3089,7 @@
+
+ fi
+
++ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+@@ -3083,7 +3097,6 @@
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+- test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
+ fi
+ fi
+@@ -3601,32 +3614,30 @@
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-#include <stdio.h>
++
+ int
+ main ()
+ {
+-FILE *f = fopen ("conftest.out", "w");
+- return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
++ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # Try to create an executable without -o first, disregard a.out.
+ # It will help us diagnose broken compilers, and finding out an intuition
+ # of exeext.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+ # The possible output files:
+@@ -3688,10 +3699,10 @@
+ else
+ ac_file=''
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+ if test -z "$ac_file"; then :
+- $as_echo "$as_me: failed program was:" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+@@ -3699,51 +3710,18 @@
+ { as_fn_set_status 77
+ as_fn_error "C compiler cannot create executables
+ See \`config.log' for more details." "$LINENO" 5; }; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
+- { { case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+-$as_echo "$ac_try_echo"; } >&5
+- (eval "$ac_try") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; }; then
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
+- fi
+- fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
++rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+ if { { ac_try="$ac_link"
+@@ -3776,13 +3754,72 @@
+ as_fn_error "cannot compute suffix of executables: cannot compile and link
+ See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-rm -f conftest$ac_cv_exeext
++rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+ if test "${ac_cv_objext+set}" = set; then :
+@@ -4365,8 +4402,8 @@
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+@@ -5186,8 +5223,8 @@
+
+
+
+-macro_version='2.2.6'
+-macro_revision='1.3012'
++macro_version='2.2.6b'
++macro_revision='1.3017'
+
+
+
+@@ -5858,13 +5895,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:5847: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5861: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5898: $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:5850: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5864: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5901: $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:5853: output\"" >&5)
+- (eval echo "\"\$as_me:5867: output\"" >&5)
++ (eval echo "\"\$as_me:5904: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -7057,7 +7055,7 @@
+@@ -6330,7 +6367,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -7069,7 +7106,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 7060 "configure"' > conftest.$ac_ext
-+ echo '#line 7058 "configure"' > conftest.$ac_ext
+- echo '#line 7072 "configure"' > conftest.$ac_ext
++ echo '#line 7109 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9114,11 +9112,11 @@
+@@ -8229,8 +8266,8 @@
+ ... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+- rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ done
+@@ -9126,11 +9163,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:9115: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9129: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9166: $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:9119: \$? = $ac_status" >&5
+- echo "$as_me:9133: \$? = $ac_status" >&5
++ echo "$as_me:9170: \$? = $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 +9451,11 @@
+@@ -9295,7 +9332,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9465,11 +9502,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:9454: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9468: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9505: $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:9458: \$? = $ac_status" >&5
+- echo "$as_me:9472: \$? = $ac_status" >&5
++ echo "$as_me:9509: \$? = $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 +9556,11 @@
+@@ -9570,11 +9607,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:9559: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9573: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9610: $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:9563: \$? = $ac_status" >&5
+- echo "$as_me:9577: \$? = $ac_status" >&5
++ echo "$as_me:9614: \$? = $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 +9611,11 @@
+@@ -9625,11 +9662,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:9614: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:9628: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9665: $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:9618: \$? = $ac_status" >&5
+- echo "$as_me:9632: \$? = $ac_status" >&5
++ echo "$as_me:9669: \$? = $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 +11994,7 @@
+@@ -9768,6 +9805,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -9859,7 +9897,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -11321,7 +11359,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -12008,7 +12046,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 11997 "configure"
+-#line 12011 "configure"
++#line 12049 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12092,7 +12090,7 @@
+@@ -12104,7 +12142,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 12093 "configure"
+-#line 12107 "configure"
++#line 12145 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14048,11 +14046,11 @@
+@@ -13044,7 +13082,7 @@
+ inherit_rpath_CXX=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -13872,7 +13910,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -14060,11 +14098,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:14049: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:14063: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14101: $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:14053: \$? = $ac_status" >&5
+- echo "$as_me:14067: \$? = $ac_status" >&5
++ echo "$as_me:14105: \$? = $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 +14145,11 @@
+@@ -14159,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:14150: $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: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 +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:14162: $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:14166: \$? = $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
-@@ -17239,106 +17237,26 @@
+@@ -14211,11 +14249,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:14214: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14252: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14218: \$? = $ac_status" >&5
++ echo "$as_me:14256: \$? = $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
+@@ -14789,7 +14827,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -15435,54 +15473,58 @@
+
+
+
+-# Check whether --with-html-dir was given.
+-if test "${with_html_dir+set}" = set; then :
+- withval=$with_html_dir;
++ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
++set dummy gtkdoc-check; ac_word=$2
++{ $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_GTKDOC_CHECK+set}" = set; then :
++ $as_echo_n "(cached) " >&6
+ else
+- with_html_dir='${datadir}/gtk-doc/html'
+-fi
+-
+- HTML_DIR="$with_html_dir"
+-
++ case $GTKDOC_CHECK in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
+
+- # Check whether --enable-gtk-doc was given.
+-if test "${enable_gtk_doc+set}" = set; then :
+- enableval=$enable_gtk_doc;
+-else
+- enable_gtk_doc=no
++ ;;
++esac
+ fi
+-
+-
+- if test x$enable_gtk_doc = xyes; then
+- if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.9\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.9") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+- test $ac_status = 0; }; then
+- :
++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
++if test -n "$GTKDOC_CHECK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
++$as_echo "$GTKDOC_CHECK" >&6; }
+ else
+- as_fn_error "You need to have gtk-doc >= 1.9 installed to build gtk-doc" "$LINENO" 5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ fi
+- fi
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
+-$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
+-$as_echo "$enable_gtk_doc" >&6; }
+
+- for ac_prog in gtkdoc-check
++ for ac_prog in gtkdoc-rebase
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ { $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_GTKDOC_CHECK+set}" = set; then :
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- case $GTKDOC_CHECK in
++ case $GTKDOC_REBASE in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
++ ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -15492,7 +15534,7 @@
+ test -z "$as_dir" && as_dir=.
+ 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_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -15503,18 +15545,116 @@
+ ;;
+ esac
+ fi
+-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+-if test -n "$GTKDOC_CHECK"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
+-$as_echo "$GTKDOC_CHECK" >&6; }
++GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
++if test -n "$GTKDOC_REBASE"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
++$as_echo "$GTKDOC_REBASE" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+- test -n "$GTKDOC_CHECK" && break
++ test -n "$GTKDOC_REBASE" && break
++done
++test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
++
++ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
++set dummy gtkdoc-mkpdf; ac_word=$2
++{ $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_GTKDOC_MKPDF+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_MKPDF in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ 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_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
+ done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
++if test -n "$GTKDOC_MKPDF"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
++$as_echo "$GTKDOC_MKPDF" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++
++# Check whether --with-html-dir was given.
++if test "${with_html_dir+set}" = set; then :
++ withval=$with_html_dir;
++else
++ with_html_dir='${datadir}/gtk-doc/html'
++fi
++
++ HTML_DIR="$with_html_dir"
++
++
++ # Check whether --enable-gtk-doc was given.
++if test "${enable_gtk_doc+set}" = set; then :
++ enableval=$enable_gtk_doc;
++else
++ enable_gtk_doc=no
++fi
++
++
++ if test x$enable_gtk_doc = xyes; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-doc >= 1.9\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk-doc >= 1.9") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ :
++else
++ as_fn_error "You need to have gtk-doc >= 1.9 installed to build $PACKAGE_NAME" "$LINENO" 5
++fi
++ fi
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build gtk-doc documentation" >&5
++$as_echo_n "checking whether to build gtk-doc documentation... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
++$as_echo "$enable_gtk_doc" >&6; }
++
++ # Check whether --enable-gtk-doc-html was given.
++if test "${enable_gtk_doc_html+set}" = set; then :
++ enableval=$enable_gtk_doc_html;
++else
++ enable_gtk_doc_html=yes
++fi
++
++ # Check whether --enable-gtk-doc-pdf was given.
++if test "${enable_gtk_doc_pdf+set}" = set; then :
++ enableval=$enable_gtk_doc_pdf;
++else
++ enable_gtk_doc_pdf=no
++fi
++
++
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
+
+
+ if test x$enable_gtk_doc = xyes; then
+@@ -15525,6 +15665,22 @@
+ ENABLE_GTK_DOC_FALSE=
+ fi
+
++ if test x$enable_gtk_doc_html = xyes; then
++ GTK_DOC_BUILD_HTML_TRUE=
++ GTK_DOC_BUILD_HTML_FALSE='#'
++else
++ GTK_DOC_BUILD_HTML_TRUE='#'
++ GTK_DOC_BUILD_HTML_FALSE=
++fi
++
++ if test x$enable_gtk_doc_pdf = xyes; then
++ GTK_DOC_BUILD_PDF_TRUE=
++ GTK_DOC_BUILD_PDF_FALSE='#'
++else
++ GTK_DOC_BUILD_PDF_TRUE='#'
++ GTK_DOC_BUILD_PDF_FALSE=
++fi
++
+ if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
+@@ -15533,6 +15689,14 @@
+ GTK_DOC_USE_LIBTOOL_FALSE=
+ fi
+
++ if test -n "$GTKDOC_REBASE"; then
++ GTK_DOC_USE_REBASE_TRUE=
++ GTK_DOC_USE_REBASE_FALSE='#'
++else
++ GTK_DOC_USE_REBASE_TRUE='#'
++ GTK_DOC_USE_REBASE_FALSE=
++fi
++
+
+
+ # Check whether --enable-largefile was given.
+@@ -17261,106 +17425,26 @@
echo "disabling ssh support"
else
@@ -688,9 +992,7 @@
-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
@@ -746,7 +1048,9 @@
-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
@@ -772,11 +1076,106 @@
fi
-Index: seahorse-2.28.0/daemon/Makefile.in
-===================================================================
---- 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 @@
+@@ -18747,10 +18831,22 @@
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then
+ as_fn_error "conditional \"PLATFORM_WIN32\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -19208,7 +19304,7 @@
+ # values after options handling.
+ ac_log="
+ This file was extended by seahorse $as_me 2.30.0, which was
+-generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
+
+ CONFIG_FILES = $CONFIG_FILES
+ CONFIG_HEADERS = $CONFIG_HEADERS
+@@ -19248,6 +19344,7 @@
+
+ -h, --help print this help, then exit
+ -V, --version print version number and configuration settings, then exit
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -19270,10 +19367,11 @@
+
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ seahorse config.status 2.30.0
+-configured by $0, generated by GNU Autoconf 2.64,
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++ with options \\"\$ac_cs_config\\"
+
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+@@ -19311,6 +19409,8 @@
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+@@ -19880,7 +19980,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -19894,7 +19994,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+diff -Naur seahorse-2.30.0.old/daemon/Makefile.in seahorse-2.30.0/daemon/Makefile.in
+--- seahorse-2.30.0.old/daemon/Makefile.in 2010-03-31 01:03:22.000000000 +0200
++++ seahorse-2.30.0/daemon/Makefile.in 2010-04-12 17:21:33.952530825 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -195,6 +195,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -271,8 +273,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -785,7 +1184,7 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -336,7 +334,7 @@
+@@ -342,7 +342,7 @@
-DLOCALEDIR=\""$(localedir)"\" \
-DPIXMAPSDIR=\""$(pixmapsdir)"\" \
-DLIBCRYPTUI_API_SUBJECT_TO_CHANGE \
@@ -794,20 +1193,25 @@
BUILT_SOURCES = \
seahorse-service-bindings.h \
-@@ -371,7 +369,7 @@
- man_MANS = seahorse-daemon.1
-
- #autostart
--desktopdir = $(sysconfdir)/xdg/autostart
-+desktopdir = $(datadir)/gnome/autostart
- desktop_in_files = seahorse-daemon.desktop.in
- desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- EXTRA_DIST = \
-Index: seahorse-2.28.0/data/Makefile.in
-===================================================================
---- 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 @@
+diff -Naur seahorse-2.30.0.old/data/icons/Makefile.in seahorse-2.30.0/data/icons/Makefile.in
+--- seahorse-2.30.0.old/data/icons/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/data/icons/Makefile.in 2010-04-12 17:21:34.076531153 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -117,6 +117,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -193,8 +195,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -816,11 +1220,25 @@
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 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 @@
+diff -Naur seahorse-2.30.0.old/data/Makefile.in seahorse-2.30.0/data/Makefile.in
+--- seahorse-2.30.0.old/data/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/data/Makefile.in 2010-04-12 17:21:34.016531207 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -179,6 +179,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -255,8 +257,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -829,11 +1247,43 @@
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 16:25:27.000000000 +0000
-+++ seahorse-2.28.0/gkr/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -247,8 +247,6 @@
+@@ -388,7 +388,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -413,7 +413,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur seahorse-2.30.0.old/gkr/Makefile.in seahorse-2.30.0/gkr/Makefile.in
+--- seahorse-2.30.0.old/gkr/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/gkr/Makefile.in 2010-04-12 17:21:34.152530829 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -178,6 +178,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -254,8 +256,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -842,11 +1292,290 @@
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 16:25:27.000000000 +0000
-+++ seahorse-2.28.0/help/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -209,8 +209,6 @@
+diff -Naur seahorse-2.30.0.old/gnome-doc-utils.make seahorse-2.30.0/gnome-doc-utils.make
+--- seahorse-2.30.0.old/gnome-doc-utils.make 2010-03-31 01:03:18.000000000 +0200
++++ seahorse-2.30.0/gnome-doc-utils.make 2010-04-12 17:21:27.413542004 +0200
+@@ -266,6 +266,13 @@
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++## @ _DOC_MOFILES
++## The .mo files used for translating the document
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
++
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ ## @ _DOC_LC_MODULES
+ ## The top-level documentation files in all other locales
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+@@ -332,16 +339,23 @@
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+ fi
+
++$(_DOC_MOFILES): %.mo: %.po
++ @if ! test -d $(dir $@); then \
++ echo "mkdir $(dir $@)"; \
++ mkdir "$(dir $@)"; \
++ fi
++ msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+
+@@ -386,12 +400,14 @@
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+ rm -f $(_DOC_LC_DOCS)
++ rm -f $(_DOC_MOFILES)
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+ echo "rm -f $$po"; \
+ rm -f "$$po"; \
+ fi; \
+ done
++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+ @for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc/.xml2po.mo"; then \
+ echo "rm -f $$lc/.xml2po.mo"; \
+diff -Naur seahorse-2.30.0.old/gtk-doc.make seahorse-2.30.0/gtk-doc.make
+--- seahorse-2.30.0.old/gtk-doc.make 2010-03-31 01:03:18.000000000 +0200
++++ seahorse-2.30.0/gtk-doc.make 2010-04-12 17:21:27.360530175 +0200
+@@ -5,13 +5,13 @@
+ ####################################
+
+ if GTK_DOC_USE_LIBTOOL
+-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ GTKDOC_RUN = $(LIBTOOL) --mode=execute
+ else
+ GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN = sh -c
++GTKDOC_RUN =
+ endif
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -31,7 +31,9 @@
+ $(DOC_MODULE)-overrides.txt
+
+ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -48,12 +50,23 @@
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+ if ENABLE_GTK_DOC
+-all-local: html-build.stamp
++if GTK_DOC_BUILD_HTML
++HTML_BUILD_STAMP=html-build.stamp
++else
++HTML_BUILD_STAMP=
++endif
++if GTK_DOC_BUILD_PDF
++PDF_BUILD_STAMP=pdf-build.stamp
++else
++PDF_BUILD_STAMP=
++endif
++
++all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ else
+ all-local:
+ endif
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -62,9 +75,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -72,7 +85,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -82,24 +95,23 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+-
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -109,18 +121,37 @@
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @-chmod -R u+w $(srcdir)
+- rm -rf $(srcdir)/html
+- mkdir $(srcdir)/html
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+- fi
+- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ fi; \
++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @touch html-build.stamp
++
++#### pdf ####
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building PDF'
++ @-chmod -R u+w $(srcdir)
++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -130,14 +161,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -157,12 +188,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -182,15 +212,13 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+diff -Naur seahorse-2.30.0.old/help/Makefile.in seahorse-2.30.0/help/Makefile.in
+--- seahorse-2.30.0.old/help/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/help/Makefile.in 2010-04-12 17:21:34.236530828 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -140,6 +140,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -216,8 +218,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -855,11 +1584,86 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/libcryptui/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -287,8 +287,6 @@
+@@ -345,6 +345,7 @@
+ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
+
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+
+@@ -692,6 +693,9 @@
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ $(_DOC_POFILES):
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+@@ -719,16 +723,23 @@
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+ fi
+
++$(_DOC_MOFILES): %.mo: %.po
++ @if ! test -d $(dir $@); then \
++ echo "mkdir $(dir $@)"; \
++ mkdir "$(dir $@)"; \
++ fi
++ msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+ .PHONY: pot
+@@ -754,12 +765,14 @@
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+ rm -f $(_DOC_LC_DOCS)
++ rm -f $(_DOC_MOFILES)
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+ echo "rm -f $$po"; \
+ rm -f "$$po"; \
+ fi; \
+ done
++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+ @for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc/.xml2po.mo"; then \
+ echo "rm -f $$lc/.xml2po.mo"; \
+diff -Naur seahorse-2.30.0.old/libcryptui/Makefile.in seahorse-2.30.0/libcryptui/Makefile.in
+--- seahorse-2.30.0.old/libcryptui/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/libcryptui/Makefile.in 2010-04-12 17:21:34.352531253 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -224,6 +224,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -300,8 +302,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -868,11 +1672,43 @@
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 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 @@
+@@ -692,7 +692,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -717,7 +717,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur seahorse-2.30.0.old/libcryptui/tests/Makefile.in seahorse-2.30.0/libcryptui/tests/Makefile.in
+--- seahorse-2.30.0.old/libcryptui/tests/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/libcryptui/tests/Makefile.in 2010-04-12 17:21:34.424531039 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -148,6 +148,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -224,8 +226,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -881,11 +1717,25 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/libegg/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -239,8 +239,6 @@
+diff -Naur seahorse-2.30.0.old/libegg/Makefile.in seahorse-2.30.0/libegg/Makefile.in
+--- seahorse-2.30.0.old/libegg/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/libegg/Makefile.in 2010-04-12 17:21:34.524530548 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -170,6 +170,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -246,8 +248,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -894,11 +1744,25 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/libseahorse/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -281,8 +281,6 @@
+diff -Naur seahorse-2.30.0.old/libseahorse/Makefile.in seahorse-2.30.0/libseahorse/Makefile.in
+--- seahorse-2.30.0.old/libseahorse/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/libseahorse/Makefile.in 2010-04-12 17:21:34.608530961 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -211,6 +211,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -287,8 +289,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -907,11 +1771,207 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/pgp/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -294,8 +294,6 @@
+diff -Naur seahorse-2.30.0.old/ltmain.sh seahorse-2.30.0/ltmain.sh
+--- seahorse-2.30.0.old/ltmain.sh 2010-03-31 01:03:17.000000000 +0200
++++ seahorse-2.30.0/ltmain.sh 2010-04-12 17:21:26.564533751 +0200
+@@ -1,6 +1,6 @@
+ # Generated from ltmain.m4sh.
+
+-# ltmain.sh (GNU libtool) 2.2.6
++# ltmain.sh (GNU libtool) 2.2.6b
+ # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+@@ -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-4
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,9 +73,9 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION="2.2.6 Debian-2.2.6a-4"
++VERSION="2.2.6b Debian-2.2.6b-2"
+ TIMESTAMP=""
+-package_revision=1.3012
++package_revision=1.3017
+
+ # Be Bourne compatible
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+diff -Naur seahorse-2.30.0.old/m4/gtk-doc.m4 seahorse-2.30.0/m4/gtk-doc.m4
+--- seahorse-2.30.0.old/m4/gtk-doc.m4 2010-03-31 01:03:18.000000000 +0200
++++ seahorse-2.30.0/m4/gtk-doc.m4 2010-04-12 17:21:27.300534704 +0200
+@@ -8,6 +8,12 @@
+ [
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++
++ dnl check for tools we added during development
++ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
++
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH([html-dir],
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+@@ -26,14 +32,30 @@
+ [PKG_CHECK_EXISTS([gtk-doc],,
+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+ fi
+
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
+ AC_MSG_RESULT($enable_gtk_doc)
+
+- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
++ dnl enable/disable output formats
++ AC_ARG_ENABLE([gtk-doc-html],
++ AS_HELP_STRING([--enable-gtk-doc-html],
++ [build documentation in html format [[default=yes]]]),,
++ [enable_gtk_doc_html=yes])
++ AC_ARG_ENABLE([gtk-doc-pdf],
++ AS_HELP_STRING([--enable-gtk-doc-pdf],
++ [build documentation in pdf format [[default=no]]]),,
++ [enable_gtk_doc_pdf=no])
++
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
++
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+ ])
+diff -Naur seahorse-2.30.0.old/m4/intltool.m4 seahorse-2.30.0/m4/intltool.m4
+--- seahorse-2.30.0.old/m4/intltool.m4 2010-03-31 01:03:18.000000000 +0200
++++ seahorse-2.30.0/m4/intltool.m4 2010-04-12 17:21:27.248566996 +0200
+@@ -172,7 +172,7 @@
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl The following CONFIG_COMMANDS should be executed at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+diff -Naur seahorse-2.30.0.old/m4/libtool.m4 seahorse-2.30.0/m4/libtool.m4
+--- seahorse-2.30.0.old/m4/libtool.m4 2010-03-31 01:03:17.000000000 +0200
++++ seahorse-2.30.0/m4/libtool.m4 2010-04-12 17:21:26.680548152 +0200
+@@ -2445,7 +2445,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -3084,7 +3084,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3705,7 +3705,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -3989,7 +3989,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -4285,6 +4285,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -4376,7 +4377,7 @@
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -5860,7 +5861,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+diff -Naur seahorse-2.30.0.old/m4/ltversion.m4 seahorse-2.30.0/m4/ltversion.m4
+--- seahorse-2.30.0.old/m4/ltversion.m4 2010-03-31 01:03:17.000000000 +0200
++++ seahorse-2.30.0/m4/ltversion.m4 2010-04-12 17:21:27.012531468 +0200
+@@ -9,15 +9,15 @@
+
+ # Generated from ltversion.in.
+
+-# serial 3012 ltversion.m4
++# serial 3017 ltversion.m4
+ # This file is part of GNU Libtool
+
+-m4_define([LT_PACKAGE_VERSION], [2.2.6])
+-m4_define([LT_PACKAGE_REVISION], [1.3012])
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
+
+ AC_DEFUN([LTVERSION_VERSION],
+-[macro_version='2.2.6'
+-macro_revision='1.3012'
++[macro_version='2.2.6b'
++macro_revision='1.3017'
+ _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+ _LT_DECL(, macro_revision, 0)
+ ])
+diff -Naur seahorse-2.30.0.old/Makefile.in seahorse-2.30.0/Makefile.in
+--- seahorse-2.30.0.old/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/Makefile.in 2010-04-12 17:21:35.552530337 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -176,6 +176,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -252,8 +254,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -920,11 +1980,75 @@
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 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 @@
+@@ -442,7 +442,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -467,7 +467,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -634,7 +634,8 @@
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -678,17 +679,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+diff -Naur seahorse-2.30.0.old/pgp/Makefile.in seahorse-2.30.0/pgp/Makefile.in
+--- seahorse-2.30.0.old/pgp/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/pgp/Makefile.in 2010-04-12 17:21:34.700530300 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -225,6 +225,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -301,8 +303,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -933,11 +2057,25 @@
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 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 @@
+diff -Naur seahorse-2.30.0.old/pixmaps/22x22/Makefile.in seahorse-2.30.0/pixmaps/22x22/Makefile.in
+--- seahorse-2.30.0.old/pixmaps/22x22/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/pixmaps/22x22/Makefile.in 2010-04-12 17:21:34.760530597 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -139,6 +139,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -215,8 +217,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -946,11 +2084,25 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/pixmaps/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -224,8 +224,6 @@
+diff -Naur seahorse-2.30.0.old/pixmaps/48x48/Makefile.in seahorse-2.30.0/pixmaps/48x48/Makefile.in
+--- seahorse-2.30.0.old/pixmaps/48x48/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/pixmaps/48x48/Makefile.in 2010-04-12 17:21:34.816530101 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -139,6 +139,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -215,8 +217,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -959,11 +2111,25 @@
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 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 @@
+diff -Naur seahorse-2.30.0.old/pixmaps/Makefile.in seahorse-2.30.0/pixmaps/Makefile.in
+--- seahorse-2.30.0.old/pixmaps/Makefile.in 2010-03-31 01:03:23.000000000 +0200
++++ seahorse-2.30.0/pixmaps/Makefile.in 2010-04-12 17:21:34.876530531 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -155,6 +155,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -231,8 +233,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -972,11 +2138,43 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/pkcs11/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -245,8 +245,6 @@
+@@ -340,7 +340,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -365,7 +365,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur seahorse-2.30.0.old/pixmaps/scalable/Makefile.in seahorse-2.30.0/pixmaps/scalable/Makefile.in
+--- seahorse-2.30.0.old/pixmaps/scalable/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/pixmaps/scalable/Makefile.in 2010-04-12 17:21:34.940536005 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -139,6 +139,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -215,8 +217,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -985,11 +2183,25 @@
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 16:25:28.000000000 +0000
-+++ seahorse-2.28.0/reference/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -224,8 +224,6 @@
+diff -Naur seahorse-2.30.0.old/pkcs11/Makefile.in seahorse-2.30.0/pkcs11/Makefile.in
+--- seahorse-2.30.0.old/pkcs11/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/pkcs11/Makefile.in 2010-04-12 17:21:35.020530807 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -176,6 +176,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -252,8 +254,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -998,11 +2210,25 @@
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 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 @@
+diff -Naur seahorse-2.30.0.old/reference/libcryptui/Makefile.in seahorse-2.30.0/reference/libcryptui/Makefile.in
+--- seahorse-2.30.0.old/reference/libcryptui/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/reference/libcryptui/Makefile.in 2010-04-12 17:21:35.148530530 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -122,6 +122,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -198,8 +200,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -1011,11 +2237,222 @@
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 16:25:29.000000000 +0000
-+++ seahorse-2.28.0/src/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -269,8 +269,6 @@
+@@ -312,10 +312,10 @@
+ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -331,7 +331,9 @@
+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
+ version.xml.in
+ DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -346,6 +348,10 @@
+ $(DOC_MODULE)-unused.txt
+
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
+ all: all-am
+
+ .SUFFIXES:
+@@ -541,10 +547,10 @@
+ uninstall-local
+
+
+- at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ @ENABLE_GTK_DOC_FALSE at all-local:
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -553,9 +559,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -563,7 +569,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -573,23 +579,23 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -599,18 +605,37 @@
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @-chmod -R u+w $(srcdir)
+- rm -rf $(srcdir)/html
+- mkdir $(srcdir)/html
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+- fi
+- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ fi; \
++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @touch html-build.stamp
++
++#### pdf ####
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building PDF'
++ @-chmod -R u+w $(srcdir)
++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -620,14 +645,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -647,12 +672,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -669,16 +693,14 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+diff -Naur seahorse-2.30.0.old/reference/libseahorse/Makefile.in seahorse-2.30.0/reference/libseahorse/Makefile.in
+--- seahorse-2.30.0.old/reference/libseahorse/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/reference/libseahorse/Makefile.in 2010-04-12 17:21:35.216531288 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -122,6 +122,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -198,8 +200,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -1024,11 +2461,222 @@
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 16:25:29.000000000 +0000
-+++ seahorse-2.28.0/ssh/Makefile.in 2009-10-15 20:10:12.000000000 +0000
-@@ -257,8 +257,6 @@
+@@ -312,10 +312,10 @@
+ --extra-dir=$(CAIRO_PREFIX)/share/gtk-doc/html/cairo
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -331,7 +331,9 @@
+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
+ version.xml.in
+ DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -346,6 +348,10 @@
+ $(DOC_MODULE)-unused.txt
+
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
+ all: all-am
+
+ .SUFFIXES:
+@@ -541,10 +547,10 @@
+ uninstall-local
+
+
+- at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ @ENABLE_GTK_DOC_FALSE at all-local:
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -553,9 +559,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -563,7 +569,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -573,23 +579,23 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -599,18 +605,37 @@
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @-chmod -R u+w $(srcdir)
+- rm -rf $(srcdir)/html
+- mkdir $(srcdir)/html
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+- fi
+- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ fi; \
++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @touch html-build.stamp
++
++#### pdf ####
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building PDF'
++ @-chmod -R u+w $(srcdir)
++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -620,14 +645,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -647,12 +672,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -669,16 +693,14 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+diff -Naur seahorse-2.30.0.old/reference/Makefile.in seahorse-2.30.0/reference/Makefile.in
+--- seahorse-2.30.0.old/reference/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/reference/Makefile.in 2010-04-12 17:21:35.080531033 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -155,6 +155,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -231,8 +233,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -1037,11 +2685,43 @@
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 @@
+@@ -341,7 +341,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -366,7 +366,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+diff -Naur seahorse-2.30.0.old/src/Makefile.in seahorse-2.30.0/src/Makefile.in
+--- seahorse-2.30.0.old/src/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/src/Makefile.in 2010-04-12 17:21:35.304530462 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -203,6 +203,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -279,8 +281,6 @@
SHELL = @SHELL@
SOUP_CFLAGS = @SOUP_CFLAGS@
SOUP_LIBS = @SOUP_LIBS@
@@ -1050,3 +2730,30 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
+diff -Naur seahorse-2.30.0.old/ssh/Makefile.in seahorse-2.30.0/ssh/Makefile.in
+--- seahorse-2.30.0.old/ssh/Makefile.in 2010-03-31 01:03:24.000000000 +0200
++++ seahorse-2.30.0/ssh/Makefile.in 2010-04-12 17:21:35.388531705 +0200
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -188,6 +188,8 @@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -264,8 +266,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=23746&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/series [utf-8] (original)
+++ desktop/unstable/seahorse/debian/patches/series [utf-8] Mon Apr 12 15:26:49 2010
@@ -1,5 +1,4 @@
01_autostart_path.patch
-02_maxpathlen_hurd.patch
08_force_ssh.patch
90_autotools.patch
99_ltmain_as-needed.patch
More information about the pkg-gnome-commits
mailing list