r10660 - in /desktop/unstable/seahorse: ./ debian/ debian/patches/
jsogo at users.alioth.debian.org
jsogo at users.alioth.debian.org
Tue May 1 21:33:10 UTC 2007
Author: jsogo
Date: Tue May 1 21:33:05 2007
New Revision: 10660
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=10660
Log:
seahorse:
+ Added to Debian pkg-gnome now that it is now a Gnome module.
+ "Moved" from my repo at r241 (http://svn.tribulaciones.org/)
Added:
desktop/unstable/seahorse/
desktop/unstable/seahorse/debian/
desktop/unstable/seahorse/debian/NEWS.Debian
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/compat
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/copyright
desktop/unstable/seahorse/debian/menu
desktop/unstable/seahorse/debian/patches/
desktop/unstable/seahorse/debian/patches/00list
desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch (with props)
desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch (with props)
desktop/unstable/seahorse/debian/patches/2_mlock.dpatch (with props)
desktop/unstable/seahorse/debian/patches/3_setuid.dpatch (with props)
desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch (with props)
desktop/unstable/seahorse/debian/patches/multiple_messages.dpatch (with props)
desktop/unstable/seahorse/debian/rules (with props)
desktop/unstable/seahorse/debian/seahorse.Xsession
Added: desktop/unstable/seahorse/debian/NEWS.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/NEWS.Debian?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/NEWS.Debian (added)
+++ desktop/unstable/seahorse/debian/NEWS.Debian Tue May 1 21:33:05 2007
@@ -1,0 +1,8 @@
+
+ From version 0.9.0 seahorse-agent has been renamed to seahorse-daemon.
+ For now, a convenient wrapper is provided, so old installations won't
+ break, but you should change your gnome-session settings, as this
+ wrapper will be dropped anytime.
+
+--
+Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 21 March 2006
Added: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (added)
+++ desktop/unstable/seahorse/debian/changelog Tue May 1 21:33:05 2007
@@ -1,0 +1,670 @@
+seahorse (1.0.1-3) unstable; urgency=low
+
+ * debian/patches/2_mlock.dpatch:
+ + Fix the mlock() check. It failed whenever called as root or with
+ fakeroot although we support mlock() as normal user (Closes: #421728).
+ * debian/patches/3_setuid.dpatch:
+ + Run chmod u+s on the correct binary (Closes: #421666).
+ * debian/patches/10_relibtoolize.dpatch:
+ + Regenerated for the above changes.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 1 May 2007 22:59:05 +0200
+
+seahorse (1.0.1-2) unstable; urgency=low
+
+ * debian/rules:
+ + Don't ship the mime-type catalog with seahorse, it's in shared-mime-info
+ since 0.20.
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 23 Apr 2007 12:31:52 +0200
+
+seahorse (1.0.1-1) unstable; urgency=low
+
+ * New upstream version
+ * Upload to unstable
+ * debian/po,
+ debian/seahorse.config,
+ debian/seahorse.templates,
+ debian/seahorse.postinst,
+ debian/control,
+ debian/rules:
+ + Remove debconf stuff. With kernels greater than 2.6.8 no suid binary
+ is needed to get mlock()'ed memory anymore.
+ * debian/patches/9_gtk-2.10-revert.dpatch:
+ + Dropped, we use gtk 2.10 now.
+ * debian/control:
+ + Update build dependencies.
+ * debian/control,
+ debian/rules:
+ + Enable epiphany plugin.
+ * debian/patches/10_relibtoolize.dpatch:
+ + Updated for new upstream version.
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 15 Apr 2007 21:20:02 +0200
+
+seahorse (1.0-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/control:
+ + Add Build-Conflicts with gnupg2 and Conflicts on
+ gnupg-agent (Closes: #407800)
+ * debian/patches/10_relibtoolize.dpatch:
+ + Updated
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 12 Mar 2007 21:14:16 +0100
+
+seahorse (0.9.92-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/patches/30_crash-fixes.dpatch,
+ debian/patches/40_crash-fix.dpatch:
+ + Dropped, merged upstream
+ * debian/patches/10_relibtoolize.dpatch:
+ + Updated for new upstream version
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 25 Feb 2007 11:10:22 +0100
+
+seahorse (0.9.91-2) experimental; urgency=low
+
+ * debian/patches/30_crash-fixes.dpatch:
+ + Fix crash when editing gpg.conf and add missing paranthesis in SSH
+ agent. Patches from Gnome SVN.
+ * debian/patches/40_crash-fix.dpatch:
+ + Fix for crash that happens when using a cached passphrase
+
+ -- Sebastian Dröge <slomo at debian.org> Fri, 23 Feb 2007 11:49:11 +0100
+
+seahorse (0.9.91-1) experimental; urgency=low
+
+ * New upstream release
+ * debian/patches/1_seahorse-agent-manpage.dpatch:
+ + Fix the binary name of seahorse-agent in the manpage. Patch from the
+ Ubuntu package by Emmet Hikory <emmet.hikory at gmail.com>.
+ * debian/patches/10_relibtoolize.dpatch:
+ + Updated for new upstream version
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 13 Feb 2007 13:23:01 +0100
+
+seahorse (0.9.10-2) unstable; urgency=low
+
+ * Upload to unstable
+ * debian/control:
+ + Remove duplicated libgnome2-dev build dependency
+
+ -- Sebastian Dröge <slomo at debian.org> Mon, 15 Jan 2007 01:25:05 +0100
+
+seahorse (0.9.10-1) experimental; urgency=low
+
+ * New upstream release:
+ + Fixes lockup when viewing key properties (Closes: #406139)
+ + Fix crash in agent when listing transientkey in cache (Closes: #405725)
+ + Don't prompt for confirmation on each key when deleting multiple
+ keys (Closes: #396024)
+ * debian/patches/9_gtk-2.10-revert.dpatch:
+ + Don't require gtk 2.10 but revert upstream commit that changed from
+ the eggtrayicon to the gtk 2.10 status icon. This version should go to
+ unstable ASAP after some testing and a gtk 2.10 dependency would prevent
+ this.
+ * debian/patches/10_relibtoolize.dpatch:
+ + Regenerated
+ * debian/control:
+ + Updated build dependencies
+ + Updated to use my debian.org mail address
+
+ -- Sebastian Dröge <slomo at debian.org> Sun, 7 Jan 2007 20:26:36 +0100
+
+seahorse (0.9.9-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/10_relibtoolize.dpatch:
+ + Regenerated for the new upstream version
+ * debian/seahorse.links:
+ + Removed seahorse-agent link... this is an application now
+ * debian/seahorse-daemon.Xsession:
+ + Call seahorse-agent instead of seahorse-daemon, renamed file to
+ seahorse.Xsession
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Wed, 20 Dec 2006 18:12:50 +0100
+
+seahorse (0.9.8-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/seahorse-daemon.Xsession,
+ debian/rules:
+ + Install Xsession script to properly start seahorse-daemon as explained
+ on http://live.gnome.org/Seahorse/SessionIntegration (Closes: #381313)
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Mon, 4 Dec 2006 00:45:11 +0100
+
+seahorse (0.9.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/patches:
+ + 9_move_libexec: drop; applied upstream.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 21 Nov 2006 22:25:32 +0100
+
+seahorse (0.9.6-1) unstable; urgency=low
+
+ * New upstream version.
+ + Fixes crashes when deleting keys (Closes: #395815)
+ * debian/patches:
+ + 9_move_libexec: make sure that nothing needs libexec (Closes: #378178)
+ + 10_relibtoolize: updated
+ + 20_amd64-ssh-crash: deleted, included upstream
+ * debian/control:
+ + Remove debconf-2.0 dependency. It is going to be added automatically by
+ dh_installdebconf
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 29 Oct 2006 12:39:56 +0100
+
+seahorse (0.9.5-3) unstable; urgency=low
+
+ * Use $(CURDIR) instead of $(PWD), to avoid generating empty packages
+ in arches using sudo instead of fakeroot (Closes: #390389)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 7 Oct 2006 10:40:26 +0200
+
+seahorse (0.9.5-2) unstable; urgency=low
+
+ * debian/seahorse.postinst,
+ debian/seahorse.postrm,
+ debian/rules:
+ + Removed update-mime-database calls and call dh_installmime to handle
+ this.
+ * debian/rules:
+ + Random cleanup for stuff that is not needed anymore
+ + Correctly set CFLAGS and other variables for configure
+ + Drop -Wl,--as-needed from LDFLAGS as it is known to break gedit plugins
+ * debian/seahorse.links,
+ debian/rules:
+ + Install a seahorse-agent link that points to seahorse-daemon
+ to allow painless upgrades from older versions and install
+ NEWS.Debian. (Closes: #359353)
+ * debian/control:
+ + Depend on debconf-2.0
+ * debian/seahorse.dirs:
+ + Drop useless file.
+ * debian/control,
+ debian/rules,
+ debian/compat:
+ + Update to debhelper compat level 5
+ * debian/patches/20_amd64-ssh-crash.dpatch:
+ + Fix amd64 crasher when using the SSH agent (Closes: #388276)
+ Patch from upstream CVS
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Fri, 22 Sep 2006 02:08:02 +0200
+
+seahorse (0.9.5-1) unstable; urgency=low
+
+ * New upstream release (Closes: #386617)
+ * debian/control:
+ + Add myself to Uploaders
+ + Tighten libnautilus-extension-dev build dependency to (>= 2.9.0) and
+ libpanel-applet2-dev to (>= 2.9.4) according to configure.ac
+ + Add build dependency on libgnome-keyring-dev
+ * debian/rules:
+ + Also remove static libcryptui and libcryptui headers
+ + Don't remove usr/libexec, it's not created anymore (Closes: #386787)
+ + Remove usr/share/mime/mime.cache as it seems to be created under some
+ circumstances and should never be shipped
+ * debian/patches/.dpatch,
+ debian/patches/00list,
+ debian/patches/seahorse_desktop.dpatch:
+ + Drop unnecessary stuff
+ * debian/patches/10_relibtoolize.dpatch:
+ + Updated for new upstream version
+
+ -- Sebastian Dröge <slomo at ubuntu.com> Tue, 12 Sep 2006 19:02:49 +0200
+
+seahorse (0.9.3-1) unstable; urgency=low
+
+ * The "I move" release.
+ * New upstream version.
+ + Fixed crash when enabling key sharing (Closes: #380160)
+ + Pipes are no longer left in ~/.gnome2 dir (Closes: #344500)
+ * debian/patches:
+ + 8_force_ssh: update to new checks made in configure.in
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 5 Sep 2006 23:02:14 +0200
+
+seahorse (0.9.1-2) unstable; urgency=low
+
+ * Add build dependency on gnome-doc-utils (Closes: #376307)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 2 Jul 2006 01:01:01 +0200
+
+seahorse (0.9.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #375723)
+ * debian/patches:
+ + seahorse-desktop: remove. Included upstream
+ + 8_force_ssh, 9_move_libexec: add a description
+ + 10_relibtoolize: remade
+ * debian/control: bumped to Standards-Version 3.7.2. No changes.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 1 Jul 2006 22:54:18 +0200
+
+seahorse (0.9.0-2) unstable; urgency=low
+
+ * debian/patches:
+ + Force ordering of patches.
+ + Fix 9_move_libexec to also move seahorse-applet location.
+ + Remade 10_relibtoolize to get every patch.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 26 Mar 2006 12:51:54 +0200
+
+seahorse (0.9.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixes problem signing imported keys (Closes: #353423)
+ + Fix critical warnings when launching seahorse in a console
+ (Closes: #342283, #328308)
+ + Do not crash on deleting multiple keys (Closes: #309571)
+ + Properties dialog shows secret keys to select (Closes: #287134)
+ + Doesn't depend on MIME type to show Nautilus menu integration. (Closes: #287131)
+ + Adds support for photo IDs (Closes: #284155)
+
+ * New build depends on:
+ + libnotify-dev: enable libnotify support.
+ + libpanel-applet2-dev: compile new clipboard applet
+ + libavahi-glib-dev: allow your public keyring to be shared using md-dns
+ + libdbus-glib-1-dev: compil dbus support
+
+ * debian/patches:
+ + force_ssh: force compiling ssh support without the need of depending on
+ openssh-client at compile time.
+ + 10_relibtoolize: updated to include changes from force_ssh in
+ configure script.
+ + seahorse_desktop: fixes menu categories for seahorse.
+ + move_libexec: use /usr/lib/seahorse instead of /usr/libexec
+ + 01_update_DE_po: applied upstream.
+ + fix-gnupg-1.4.2: included upstream.
+ + gpgme_1.1.0-check: included upstream.
+
+ * debian/po:
+ + add sv.po file (Closes: #333694)
+ + s/agent/daemon/g in every .po file.
+
+ * Recommend openssh-client, as we can now manage SSH keys as well.
+
+ * Added NEWS.Debian file talking about renaming of seahorse-agent to
+ seahorse-daemon.
+
+ * debian/seahorse.postinst, debian/seahorse.templates: change seahorse-agent
+ for seahorse-daemon.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 25 Mar 2006 14:09:59 +0100
+
+
+seahorse (0.8.0-1) unstable; urgency=low
+
+ * New upstream version.
+ + fix-gnupg-1.4.2 patch disabled. Included upstream
+ * Build-Depend on libnautilus-extension-dev. Thanks to Sebastian Bacher for
+ pointing this
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Wed, 12 Oct 2005 14:47:37 +0200
+
+seahorse (0.7.9-4) unstable; urgency=low
+
+ * debian/patches:
+ + fix-gnupg-1.4.2: fix problems when used with GnuPG 1.4.2.
+ Patch got from upstream Gnome Bugzilla, bug #313329
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 1 Oct 2005 20:33:37 +0200
+
+seahorse (0.7.9-3) unstable; urgency=low
+
+ * Binary upload in i386 didn't include nautilus-extension library.
+ Reuploading.
+ * Cleaning all .a and .la files around. I don't think nobody is going
+ to develop using seahorse internal libs.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 1 Oct 2005 10:18:08 +0200
+
+seahorse (0.7.9-2) unstable; urgency=low
+
+ * Actually include French debconf translation (Closes: #315587)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 18 Sep 2005 17:01:27 +0200
+
+seahorse (0.7.9-1) unstable; urgency=low
+
+ * New upstream release (only requested in IRC)
+ + Keyring backups not created world readable (Closes: #314726)
+ + Do not crash if gpg.conf is not available (Closes: #322658)
+
+ * Debconf translations updated:
+ + Italian (Closes: #313238)
+ + French (Closes: #315587)
+ + German (Closes: #326143)
+ + Vietnamese (Closes: #317932)
+
+ * debian/rules: remove left files in /usr/share/mime at install target
+ (Closes: #313408, #313130)
+ * debian/patches:
+ + 10_relibtoolize: update
+ + 01_update_DE_po: new (Closes: #313914)
+ * debian/control:
+ + Update Standards-Version to 3.6.2. No changes needed.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 16 Sep 2005 23:24:13 +0200
+
+seahorse (0.7.8-2) unstable; urgency=low
+
+ * Uploaded to unstable along with GNOME 2.10 transition.
+ * Build-depend on libsoup2.2-dev and libldap2-dev. (Closes: #311954)
+ * Added Czech debconf translation by Miroslav Kure. (Closes: #308469)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 11 Jun 2005 12:07:35 +0200
+
+seahorse (0.7.8-1) experimental; urgency=low
+
+ * New upstream version. (Closes: #306433)
+ * Compiled with GNOME 2.10 libs and new Nautilus extension.
+ * Hey, we are shipping gedit plugin since 0.7.6-5 (Closes: #283513)
+ * New Frech debconf translation. Julien Valroff (Closes: #298327)
+ * New Spanish debconf translation. (Me)
+ * Remove libeel from build-depends. No longer needed.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sun, 8 May 2005 10:32:51 +0200
+
+seahorse (0.7.6-5) unstable; urgency=low
+
+ * Tighten build dependency in gedit to version >=2.8.3-3 (Closes: #303125)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 5 Apr 2005 21:49:34 +0200
+
+seahorse (0.7.6-4) unstable; urgency=low
+
+ * Enable gedit plugin, as we now have a gedit-dev package.
+ * debian/control: add gedit plugin to description and a Enhaces: gedit
+ field.
+ * Passing -Wl,-O1 -Wl,--as-needed to linker. Should reduce binary
+ dependencies.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 1 Apr 2005 21:18:35 +0200
+
+seahorse (0.7.6-3) unstable; urgency=low
+
+ * The "3rd in 3 days" release. I am sorry for autobuilders.
+ * Fixed postrm script. It does not fail on unknown parameters.
+ (Closes: #296189)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Mon, 21 Feb 2005 23:43:44 +0100
+
+seahorse (0.7.6-2) unstable; urgency=low
+
+ * The "seahorse is not cpufreq-selector" release.
+ * Patched debconf template. (Closes: #296044, #296045)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 19 Feb 2005 23:40:46 +0100
+
+seahorse (0.7.6-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixed yelp. (Closes: #279845)
+ + Works with GnuPG 1.4 (Closes: #294179)
+ + New key properties dialog. (Closes: #285711)
+ + Allows encryption to self. (Closes: #287132)
+ + Initial keyserver support. (Closes: #284156)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 19 Feb 2005 19:02:30 +0100
+
+seahorse (0.7.5-3) unstable; urgency=low
+
+ * debian/rules:
+ + Removed more mime stuff which was being installed with the package.
+
+ * debian/seahorse.postrm:
+ + Only call update-mime-database on remove.
+
+ * debian/seahorse.postinst:
+ + Only call update-mime-database on remove.
+ + Added a debconf question about setting seahorse-agent SUID root.
+
+ * debian/seahorse.[config,templates]:
+ + New. Added a debconf question about setting seahorse-agent SUID root.
+
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 11 Nov 2004 00:07:36 +0100
+
+seahorse (0.7.5-2) unstable; urgency=low
+
+ * debian/rules:
+ + Removed from the package mime files that should be generated
+ by update-mime-database on each system. (Closes: #279742)
+
+ * debian/seahorse.post[inst,rm]:
+ + Added to call update-mime-database on each install and removal,
+ so we fix systems broken by previous version.
+
+ * debian/control:
+ + Let's Build-Depend on debhelper version containing dh_desktop.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 5 Nov 2004 18:48:42 +0100
+
+seahorse (0.7.5-1) unstable; urgency=low
+
+ * New upstream version
+ * Using dh_desktop now.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Wed, 3 Nov 2004 22:53:43 +0100
+
+seahorse (0.7.4-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #277497)
+ + It now depends on gpgme 1.0.x (Closes: #221606)
+ + Fixed crash on exit. (Closes: #268301)
+ + Handle properly key signatures. (Closes: #268300)
+ + Don't freeze when using gpg. (Closes: #264404)
+
+ * debian/control:
+ + Build-Depend on libgpgme11-dev
+
+ * debian/rules:
+ + use dh_gconf, so gconf registry is restarted in postinst. (Closes: #254218)
+ + disable gedit plugin until a gedit-dev package is available.
+
+ * debian/patches:
+ + 01_fix_pgp-preferences_icon: removed
+ + 10_relibtoolize: updated
+ + 00list: updated
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 23 Oct 2004 12:29:03 +0200
+
+seahorse (0.7.3-6) unstable; urgency=low
+
+ * Added missing libxml-parser-perl to buil dependencies. (Closes: #265043)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Wed, 11 Aug 2004 18:29:39 +0200
+
+seahorse (0.7.3-5) unstable; urgency=low
+
+ * debian/patches:
+ - 10_relibtoolize: updated & really applied. The resulting package
+ shouldn't depend on libgcrypt7 (Closes: #263660)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 6 Aug 2004 01:27:16 +0200
+
+seahorse (0.7.3-4) unstable; urgency=low
+
+ * debian/patches:
+ - 10_relibtoolize: Relibtoolized to get only the needed dependencies.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 19 Jun 2004 17:34:37 +0200
+
+seahorse (0.7.3-3) unstable; urgency=low
+
+ * Using dh_gconf and dh_scrollkeeper now.
+ * Removed reference to /usr/share/common-licenses/GFDL. (Closes: #215017)
+ * Link with new gnutls. (Closes: #221626)
+ * Corrected reference from icon in Gnome menu. (Closes: #222032)
+ * Fixed Debian menu. (Closes: #229944)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 19 Mar 2004 15:37:08 +0100
+
+seahorse (0.7.3-2) unstable; urgency=low
+
+ * Relibtoolized. (Closes: #192316)
+ * Fixed a bug in postinst which made gconf schema not to
+ be installed. (Closes: #192357)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 8 May 2003 22:33:40 +0200
+
+seahorse (0.7.3-1) unstable; urgency=low
+
+ * New upstream version.
+ * Added libeel2-dev build-dependency.
+ * Added explicit build-dependency on debhelper (>= 4.0.0)
+ * Bumped standars-version to 3.5.9. No changes
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 6 May 2003 22:28:39 +0200
+
+seahorse (0.7.1-1) unstable; urgency=low
+
+ * Another new upstream version.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 4 Mar 2003 21:08:41 +0100
+
+seahorse (0.7.0-1) unstable; urgency=low
+
+ * New upstream version.
+ No bugs closed, as no bugs have been filled :-)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 11 Feb 2003 23:21:59 +0100
+
+seahorse (0.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 1 Feb 2003 10:10:50 +0100
+
+seahorse (0.6.0-1) unstable; urgency=low
+
+ * New upstream release. This is live again. (Closes: #170813)
+ * This is a completely rewrite, for GNOME 2 (Closes: #95848, #165769)
+ * Got es.po from CVS because file released with 0.6.0 is bad UTF-8 encoded
+ * Standars-Version -> 3.5.8
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 23 Jan 2003 23:48:10 +0100
+
+seahorse (0.5.0-5) unstable; urgency=low
+
+ * Moved to main.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Wed, 24 Apr 2002 00:55:30 +0200
+
+seahorse (0.5.0-4) unstable; urgency=low
+
+ * I forgot to change Mantainer field in debian/control file. Sorry
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Fri, 8 Feb 2002 15:42:21 +0100
+
+seahorse (0.5.0-3) unstable; urgency=low
+
+ * I have adopted this package. (Closes: #132441)
+ * I have applied a little patch to not show passphrase when
+ signing a key (Closes: #132435)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Thu, 7 Feb 2002 20:37:25 +0100
+
+seahorse (0.5.0-2) unstable; urgency=low
+
+ * Package orphaned.
+
+ -- Christian Marillat <marillat at debian.org> Wed, 6 Feb 2002 18:37:50 +0100
+
+seahorse (0.5.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat <marillat at debian.org> Tue, 20 Feb 2001 10:21:13 +0100
+
+seahorse (0.4.9-3) unstable; urgency=low
+
+ * Build against the latest gnome-libs 1.2.11
+
+ -- Christian Marillat <marillat at debian.org> Wed, 14 Feb 2001 14:19:36 +0100
+
+seahorse (0.4.9-2) unstable; urgency=low
+
+ * Switch to debhelper v2.
+ * debian/control removed unnecessary build-depends.
+
+ -- Christian Marillat <marillat at debian.org> Thu, 25 Jan 2001 14:02:24 +0100
+
+seahorse (0.4.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * Removed the debian folder from orig.tar.gz (Closes: #66793).
+ * Added build-depends field. Standards-Version: to 3.1.1.1
+ * New e-mail address.
+
+ -- Christian Marillat <marillat at debian.org> Mon, 10 Jul 2000 16:23:52 +0200
+
+seahorse (0.4.8-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Christian Marillat <marillat.christian at wanadoo.fr> Tue, 13 Jun 2000 22:57:36 +0200
+
+seahorse (0.4.6-2) unstable; urgency=low
+
+ * Moved to non-US.
+
+ -- Christian Marillat <marillat.christian at wanadoo.fr> Tue, 23 May 2000 09:06:25 +0200
+
+seahorse (0.4.6-1) unstable; urgency=low
+
+ * New Seahorse Release, First official debian release..
+
+ -- Christian Marillat <marillat.christian at wanadoo.fr> Fri, 19 May 2000 14:49:09 +0200
+
+seahorse (0.4.5-1) unstable; urgency=low
+
+ * New Seahorse Release.
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Sun, 7 May 2000 22:06:38 +0900
+
+seahorse (0.4.0-1) unstable; urgency=low
+
+ * New Seahorse Release.
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Sun, 7 May 2000 22:06:05 +0900
+
+seahorse (0.3.6-1) unstable; urgency=low
+
+ * New Seahorse Release.
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Sun, 20 Feb 2000 22:20:45 +0900
+
+seahorse (0.3.5-1) unstable; urgency=low
+
+ * New Seahorse Release.
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Sat, 19 Feb 2000 16:20:53 +0900
+
+seahorse (0.3.4-1) unstable; urgency=low
+
+ * New Seahorse Release.
+ *
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Sat, 19 Feb 2000 16:20:20 +0900
+
+seahorse (0.3.2-1) unstable; urgency=low
+
+ * New Seahorse Release.
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Wed, 26 Jan 2000 05:54:20 +0900
+
+seahorse (0.3.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Anthony Mulcahy <anthony at kcn.ne.jp> Mon, 10 Jan 2000 22:17:00 +0900
+
+Local variables:
+mode: debian-changelog
+End:
Added: desktop/unstable/seahorse/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/compat?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/compat (added)
+++ desktop/unstable/seahorse/debian/compat Tue May 1 21:33:05 2007
@@ -1,0 +1,1 @@
+5
Added: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/control (added)
+++ desktop/unstable/seahorse/debian/control Tue May 1 21:33:05 2007
@@ -1,0 +1,25 @@
+Source: seahorse
+Section: gnome
+Priority: optional
+Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
+Uploaders: Sebastian Dröge <slomo at debian.org>
+Build-Depends: debhelper (>= 5), libgnome2-dev (>= 2.14.0), libglade2-dev, libgnomeui-dev (>= 2.10.0), scrollkeeper, libgpgme11-dev, autotools-dev, dpatch, libxml-parser-perl, gedit-dev (>= 2.10.0), libsoup2.2-dev, libldap2-dev, libnautilus-extension-dev (>= 2.9.0), libnotify-dev, libpanel-applet2-dev (>= 2.9.4), libavahi-glib-dev, libdbus-glib-1-dev, gnome-doc-utils, libgnome-keyring-dev, libglib2.0-dev (>= 2.10.0), libgtk2.0-dev (>= 2.10.0), epiphany-browser-dev (>= 2.14), libxml2-dev (>= 2.6.0), libxul-dev (>= 1.8)
+Build-Conflicts: gnupg2
+Standards-Version: 3.7.2
+
+Package: seahorse
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: openssh-client
+Conflicts: gnupg-agent
+Description: A Gnome front end for GnuPG
+ Seahorse is a Gnome front end for GnuPG - the Gnu Privacy Guard program. It
+ is a tool for secure communications and data storage. Data encryption and
+ digital signature creation can easily be performed through a GUI and Key
+ Management operations can easily be carried out through an intuitive
+ interface.
+ .
+ In addition it includes a Gedit plugin, can handle files using Nautilus,
+ an applet for manging stuff put in the clipboard and an agent for storing
+ private passphrases, as well as a GnuPG and OpenSSH key manager.
+
Added: desktop/unstable/seahorse/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/copyright?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/copyright (added)
+++ desktop/unstable/seahorse/debian/copyright Tue May 1 21:33:05 2007
@@ -1,0 +1,16 @@
+This package was debianized by Jose Carlos Garcia Sogo <jsogo at debian.org> on
+Mon, 17 Jan 2003 20:14:10 +0100.
+
+It was downloaded from ftp://ftp.gnome.org/pub/GNOME/sources/seahorse
+
+Upstream Authors: Nate Nielsen <nielsen at memberwebs.com>, Adam Schreiber <sadam at clemson.edu>
+
+Copyright (C) 2001, 2002 Jose Carlos Garcia Sogo
+Copyright (C) 2002, 2003 Jacob Perkins
+Copyright (C) 2004, 2006 Nate Nielsen, Adam Schreiber
+
+You are free to distribute this software under the terms of the GNU General Public License.
+Documentation and help files are covered by GFDL license.
+
+On Debian systems, the complete text of the GNU General Public License can be found
+in /usr/share/common-licenses/GPL file.
Added: desktop/unstable/seahorse/debian/menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/menu?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/menu (added)
+++ desktop/unstable/seahorse/debian/menu Tue May 1 21:33:05 2007
@@ -1,0 +1,7 @@
+?package(seahorse):needs="X11" \
+ section="Apps/Tools" \
+ hints="Gnome" \
+ title="Seahorse" \
+ longtitle="A GNOME frontend for GnuPG" \
+ command="/usr/bin/seahorse" \
+ icon="/usr/share/pixmaps/seahorse.png"
Added: desktop/unstable/seahorse/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/00list?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/00list (added)
+++ desktop/unstable/seahorse/debian/patches/00list Tue May 1 21:33:05 2007
@@ -1,0 +1,5 @@
+1_seahorse-agent-manpage.dpatch
+2_mlock.dpatch
+3_setuid.dpatch
+8_force_ssh.dpatch
+10_relibtoolize.dpatch
Added: desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch Tue May 1 21:33:05 2007
@@ -1,0 +1,9966 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/aclocal.m4 seahorse-1.0.1/aclocal.m4
+--- seahorse-1.0.1-old/aclocal.m4 2007-04-03 18:17:38.000000000 +0200
++++ seahorse-1.0.1/aclocal.m4 2007-05-01 22:57:19.000000000 +0200
+@@ -1,7 +1,7 @@
+-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.10 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005 Free Software Foundation, Inc.
++# 2005, 2006 Free Software Foundation, Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,6 +11,11 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
++m4_if(m4_PACKAGE_VERSION, [2.61],,
++[m4_fatal([this file was generated for autoconf 2.61.
++You have another version of autoconf. If you want to use that,
++you should regenerate the build system entirely.], [63])])
++
+ dnl AM_GCONF_SOURCE_2
+ dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+ dnl (i.e. pass to gconftool-2
+@@ -7012,7 +7017,7 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7022,14 +7027,29 @@
+ # ----------------------------
+ # Automake X.Y traces this macro to ensure aclocal.m4 has been
+ # generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.10'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version. Point them to the right macro.
++m4_if([$1], [1.10], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
++])
++
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+
+ # AM_SET_CURRENT_AUTOMAKE_VERSION
+ # -------------------------------
+-# Call AM_AUTOMAKE_VERSION so it can be traced.
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.6])])
++[AM_AUTOMAKE_VERSION([1.10])dnl
++_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+@@ -7086,14 +7106,14 @@
+
+ # AM_CONDITIONAL -*- Autoconf -*-
+
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 7
++# serial 8
+
+ # AM_CONDITIONAL(NAME, SHELL-CONDITION)
+ # -------------------------------------
+@@ -7102,8 +7122,10 @@
+ [AC_PREREQ(2.52)dnl
+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])
+-AC_SUBST([$1_FALSE])
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+@@ -7117,15 +7139,14 @@
+ Usually this means the macro was only invoked conditionally.]])
+ fi])])
+
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 8
++# serial 9
+
+ # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+ # written in clear, in which case automake, when reading aclocal.m4,
+@@ -7153,6 +7174,7 @@
+ ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], UPC, [depcc="$UPC" am_compiler_list=],
+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+ [depcc="$$1" am_compiler_list=])
+
+@@ -7218,6 +7240,7 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -7270,7 +7293,8 @@
+ AMDEPBACKSLASH='\'
+ fi
+ AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ ])
+
+ # Generate code to set up dependency tracking. -*- Autoconf -*-
+@@ -7295,8 +7319,9 @@
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+- # So let's grep whole file.
+- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ dirpart=`AS_DIRNAME("$mf")`
+ else
+ continue
+@@ -7355,8 +7380,8 @@
+
+ # Do all the work for Automake. -*- Autoconf -*-
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7379,16 +7404,20 @@
+ # arguments mandatory, and then we can depend on a new Autoconf
+ # release and drop the old call support.
+ AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.58])dnl
++[AC_PREREQ([2.60])dnl
+ dnl Autoconf wants to disallow AM_ names. We explicitly allow
+ dnl the ones we care about.
+ m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+ AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++ fi
+ fi
+
+ # test whether we have cygpath
+@@ -7408,6 +7437,9 @@
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+ [_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
+
+@@ -7443,6 +7475,10 @@
+ [_AM_DEPENDENCIES(CXX)],
+ [define([AC_PROG_CXX],
+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++ [_AM_DEPENDENCIES(OBJC)],
++ [define([AC_PROG_OBJC],
++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+ ])
+ ])
+
+@@ -7478,7 +7514,7 @@
+ # Define $install_sh.
+ AC_DEFUN([AM_PROG_INSTALL_SH],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+ AC_SUBST(install_sh)])
+
+ # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+@@ -7585,14 +7621,14 @@
+
+ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+ # Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+
+-# serial 4
++# serial 5
+
+ # AM_MISSING_PROG(NAME, PROGRAM)
+ # ------------------------------
+@@ -7608,6 +7644,7 @@
+ # If it does, set am_missing_run to use it, otherwise, to nothing.
+ AC_DEFUN([AM_MISSING_HAS_RUN],
+ [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
+ test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+ # Use eval to expand $SHELL
+ if eval "$MISSING --run true"; then
+@@ -7618,7 +7655,7 @@
+ fi
+ ])
+
+-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ #
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+@@ -7626,60 +7663,23 @@
+
+ # AM_PROG_MKDIR_P
+ # ---------------
+-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+-#
+-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
+-# created by `make install' are always world readable, even if the
+-# installer happens to have an overly restrictive umask (e.g. 077).
+-# This was a mistake. There are at least two reasons why we must not
+-# use `-m 0755':
+-# - it causes special bits like SGID to be ignored,
+-# - it may be too restrictive (some setups expect 775 directories).
+-#
+-# Do not use -m 0755 and let people choose whatever they expect by
+-# setting umask.
+-#
+-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
+-# Some implementations (such as Solaris 8's) are not thread-safe: if a
+-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
+-# concurrently, both version can detect that a/ is missing, but only
+-# one can create it and the other will error out. Consequently we
+-# restrict ourselves to GNU make (using the --version option ensures
+-# this.)
++# Check for `mkdir -p'.
+ AC_DEFUN([AM_PROG_MKDIR_P],
+-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
+- else
+- mkdir_p='$(install_sh) -d'
+- fi
+-fi
+-AC_SUBST([mkdir_p])])
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++ [[\\/$]]* | ?:[[\\/]]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
+
+ # Helper functions for option handling. -*- Autoconf -*-
+
+@@ -7791,9 +7791,21 @@
+ if test "$cross_compiling" != no; then
+ AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
++# Copyright (C) 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
+ # Check how to create a tarball. -*- Autoconf -*-
+
+ # Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/agent/Makefile.in seahorse-1.0.1/agent/Makefile.in
+--- seahorse-1.0.1-old/agent/Makefile.in 2007-04-03 18:17:43.000000000 +0200
++++ seahorse-1.0.1/agent/Makefile.in 2007-05-01 22:57:36.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -70,17 +66,18 @@
+ seahorse_agent_DEPENDENCIES = \
+ $(top_builddir)/libseahorse/libseahorse.a \
+ $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(seahorse_agent_SOURCES)
+ DIST_SOURCES = $(am__seahorse_agent_SOURCES_DIST)
+ man1dir = $(mandir)/man1
+@@ -101,8 +98,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -133,8 +128,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -148,8 +141,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -165,23 +156,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -227,9 +203,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -244,8 +219,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -254,8 +227,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -270,48 +241,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -323,6 +263,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -350,8 +291,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ gladedir = $(datadir)/seahorse/glade/
+ pixmapsdir = $(datadir)/pixmaps/
+ INCLUDES = -I$(top_builddir) \
+@@ -423,7 +367,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -451,7 +395,7 @@
+ done
+ seahorse-agent$(EXEEXT): $(seahorse_agent_OBJECTS) $(seahorse_agent_DEPENDENCIES)
+ @rm -f seahorse-agent$(EXEEXT)
+- $(LINK) $(seahorse_agent_LDFLAGS) $(seahorse_agent_OBJECTS) $(seahorse_agent_LDADD) $(LIBS)
++ $(LINK) $(seahorse_agent_OBJECTS) $(seahorse_agent_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -469,22 +413,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-agent.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -494,13 +438,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -545,7 +485,7 @@
+ done
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -610,22 +550,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -641,7 +580,7 @@
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gladedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -677,7 +616,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -691,14 +630,22 @@
+
+ install-data-am: install-gladeDATA install-man
+
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man: install-man1
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -719,30 +666,32 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
+- uninstall-info-am uninstall-man
++uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA uninstall-man
+
+ uninstall-man: uninstall-man1
+
++.MAKE: install-am install-exec-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-binPROGRAMS install-data install-data-am install-exec \
+- install-exec-am install-exec-hook install-gladeDATA \
+- install-info install-info-am install-man install-man1 \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-gladeDATA uninstall-info-am \
+- uninstall-man uninstall-man1
++ install-binPROGRAMS install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-exec-hook \
++ install-gladeDATA install-html install-html-am install-info \
++ install-info-am install-man install-man1 install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-binPROGRAMS \
++ uninstall-gladeDATA uninstall-man uninstall-man1
+
+
+ # Don't make the daemon setuid
+ # Make the daemon setuid
+ @HAVE_USER_MLOCK_FALSE at install-exec-hook:
+- at HAVE_USER_MLOCK_FALSE@ chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon
++ at HAVE_USER_MLOCK_FALSE@ chmod u+s $(DESTDIR)$(bindir)/seahorse-agent
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/configure seahorse-1.0.1/configure
+--- seahorse-1.0.1-old/configure 2007-04-03 18:17:51.000000000 +0200
++++ seahorse-1.0.1/configure 2007-05-01 22:57:28.000000000 +0200
+@@ -807,6 +807,7 @@
+ INSTALL_PROGRAM
+ INSTALL_SCRIPT
+ INSTALL_DATA
++am__isrc
+ CYGPATH_W
+ PACKAGE
+ VERSION
+@@ -995,9 +996,6 @@
+ WITH_APPLET_FALSE
+ LIBNOTIFY_CFLAGS
+ LIBNOTIFY_LIBS
+-SSH_KEYGEN_PATH
+-SSH_ADD_PATH
+-SSH_PATH
+ WITH_SSH_TRUE
+ WITH_SSH_FALSE
+ WITH_TESTS_TRUE
+@@ -2190,7 +2188,8 @@
+
+
+
+-am__api_version="1.9"
++am__api_version='1.10'
++
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+ if test -f "$ac_dir/install-sh"; then
+@@ -2373,38 +2372,53 @@
+ echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+
+-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+- # We used to keeping the `.' as first argument, in order to
+- # allow $(mkdir_p) to be used without argument. As in
+- # $(mkdir_p) $(somedir)
+- # where $(somedir) is conditionally defined. However this is wrong
+- # for two reasons:
+- # 1. if the package is installed by a user who cannot write `.'
+- # make install will fail,
+- # 2. the above comment should most certainly read
+- # $(mkdir_p) $(DESTDIR)$(somedir)
+- # so it does not work when $(somedir) is undefined and
+- # $(DESTDIR) is not.
+- # To support the latter case, we have to write
+- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
+- # so the `.' trick is pointless.
+- mkdir_p='mkdir -p --'
+-else
+- # On NextStep and OpenStep, the `mkdir' command does not
+- # recognize any option. It will interpret all options as
+- # directories to create, and then abort because `.' already
+- # exists.
+- for d in ./-p ./--version;
+- do
+- test -d $d && rmdir $d
+- done
+- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
+- if test -f "$ac_aux_dir/mkinstalldirs"; then
+- mkdir_p='$(mkinstalldirs)'
++{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
++if test -z "$MKDIR_P"; then
++ if test "${ac_cv_path_mkdir+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_prog in mkdir gmkdir; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
++ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
++ 'mkdir (GNU coreutils) '* | \
++ 'mkdir (coreutils) '* | \
++ 'mkdir (fileutils) '4.1*)
++ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
++ break 3;;
++ esac
++ done
++ done
++done
++IFS=$as_save_IFS
++
++fi
++
++ if test "${ac_cv_path_mkdir+set}" = set; then
++ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+- mkdir_p='$(install_sh) -d'
++ # As a last resort, use the slow shell script. Don't cache a
++ # 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
++{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++echo "${ECHO_T}$MKDIR_P" >&6; }
++
++mkdir_p="$MKDIR_P"
++case $mkdir_p in
++ [\\/$]* | ?:[\\/]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
+
+ for ac_prog in gawk mawk nawk awk
+ do
+@@ -2487,12 +2501,16 @@
+ fi
+ rmdir .tst 2>/dev/null
+
+-# test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" &&
+- test -f $srcdir/config.status; then
+- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ am__isrc=' -I$(srcdir)'
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+ echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exit 1; }; }
++ fi
+ fi
+
+ # test whether we have cygpath
+@@ -2535,7 +2553,7 @@
+
+ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+-install_sh=${install_sh-"$am_aux_dir/install-sh"}
++install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
+
+ # Installed binaries are usually stripped using `strip' when the user
+ # run `make install-strip'. However `strip' might not be the right
+@@ -2639,7 +2657,7 @@
+ fi
+
+ fi
+-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+
+ # We need awk for the "check" target. The system "awk" is bad on
+ # some platforms.
+@@ -2666,9 +2684,7 @@
+
+ { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
+ echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
+-
+-
+-if test $USE_MAINTAINER_MODE = yes; then
++ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+ MAINTAINER_MODE_FALSE='#'
+ else
+@@ -2734,9 +2750,7 @@
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+ fi
+-
+-
+-if test "x$enable_dependency_tracking" != xno; then
++ if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+ else
+@@ -2745,7 +2759,6 @@
+ fi
+
+
+-
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -3732,6 +3745,7 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -3761,9 +3775,7 @@
+ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+-
+-
+-if
++ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+@@ -5024,7 +5036,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5027 "configure"' > conftest.$ac_ext
++ echo '#line 5039 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -6248,6 +6260,7 @@
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+@@ -6277,9 +6290,7 @@
+ echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+
+-
+-
+-if
++ if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
+ am__fastdepCXX_TRUE=
+@@ -7751,11 +7762,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:7754: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:7765: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:7758: \$? = $ac_status" >&5
++ echo "$as_me:7769: \$? = $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.
+@@ -8019,11 +8030,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:8022: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8033: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8026: \$? = $ac_status" >&5
++ echo "$as_me:8037: \$? = $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.
+@@ -8123,11 +8134,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:8126: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8137: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:8130: \$? = $ac_status" >&5
++ echo "$as_me:8141: \$? = $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
+@@ -10420,7 +10431,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 10423 "configure"
++#line 10434 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -10520,7 +10531,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 10523 "configure"
++#line 10534 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12856,11 +12867,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:12859: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12870: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:12863: \$? = $ac_status" >&5
++ echo "$as_me:12874: \$? = $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.
+@@ -12960,11 +12971,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:12963: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:12974: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:12967: \$? = $ac_status" >&5
++ echo "$as_me:12978: \$? = $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
+@@ -14521,11 +14532,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:14524: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14535: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14528: \$? = $ac_status" >&5
++ echo "$as_me:14539: \$? = $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.
+@@ -14625,11 +14636,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:14628: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14639: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14632: \$? = $ac_status" >&5
++ echo "$as_me:14643: \$? = $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
+@@ -16812,11 +16823,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:16815: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16826: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16819: \$? = $ac_status" >&5
++ echo "$as_me:16830: \$? = $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.
+@@ -17080,11 +17091,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:17083: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17094: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:17087: \$? = $ac_status" >&5
++ echo "$as_me:17098: \$? = $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.
+@@ -17184,11 +17195,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:17187: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17198: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:17191: \$? = $ac_status" >&5
++ echo "$as_me:17202: \$? = $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
+@@ -19878,9 +19889,7 @@
+ esac
+ fi
+
+-
+-
+-if test "$enable_schemas_install" != no; then
++ if test "$enable_schemas_install" != no; then
+ GCONF_SCHEMAS_INSTALL_TRUE=
+ GCONF_SCHEMAS_INSTALL_FALSE='#'
+ else
+@@ -20072,9 +20081,7 @@
+ enable_scrollkeeper=yes
+ fi
+
+-
+-
+-if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
++ if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
+ ENABLE_SK_TRUE=
+ ENABLE_SK_FALSE='#'
+ else
+@@ -20083,9 +20090,7 @@
+ fi
+
+
+-
+-
+-if test "$gdu_cv_have_gdu" = "yes"; then
++ if test "$gdu_cv_have_gdu" = "yes"; then
+ HAVE_GNOME_DOC_UTILS_TRUE=
+ HAVE_GNOME_DOC_UTILS_FALSE='#'
+ else
+@@ -21034,6 +21039,7 @@
+ #include <sys/mman.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
++ #include <stdio.h>
+
+ int main () {
+ long int pgsize = getpagesize ();
+@@ -21047,10 +21053,11 @@
+ return 2;
+ }
+ /* Configure is being run as root? */
+- if (geteuid () == 0) {
++ /* breaks with fakeroot */
++ /* if (geteuid () == 0) {
+ printf("assuming ");
+ return 1;
+- }
++ } */
+ return 0;
+ }
+
+@@ -21091,9 +21098,7 @@
+
+ fi
+
+-
+-
+-if test "$seahorse_cv_have_user_mlock" = "yes"; then
++ if test "$seahorse_cv_have_user_mlock" = "yes"; then
+ HAVE_USER_MLOCK_TRUE=
+ HAVE_USER_MLOCK_FALSE='#'
+ else
+@@ -21255,9 +21260,7 @@
+ esac
+ { echo "$as_me:$LINENO: result: $platform_win32" >&5
+ echo "${ECHO_T}$platform_win32" >&6; }
+-
+-
+-if test "$platform_win32" = "yes"; then
++ if test "$platform_win32" = "yes"; then
+ PLATFORM_WIN32_TRUE=
+ PLATFORM_WIN32_FALSE='#'
+ else
+@@ -21278,9 +21281,7 @@
+ esac
+ { echo "$as_me:$LINENO: result: $os_win32" >&5
+ echo "${ECHO_T}$os_win32" >&6; }
+-
+-
+-if test "$os_win32" = "yes"; then
++ if test "$os_win32" = "yes"; then
+ OS_WIN32_TRUE=
+ OS_WIN32_FALSE='#'
+ else
+@@ -21926,9 +21927,7 @@
+ done
+ fi
+
+-
+-
+-if test "$with_ldap" = "yes"; then
++ if test "$with_ldap" = "yes"; then
+ WITH_LDAP_TRUE=
+ WITH_LDAP_FALSE='#'
+ else
+@@ -22046,9 +22045,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$enable_hkp" = "yes"; then
++ if test "$enable_hkp" = "yes"; then
+ WITH_HKP_TRUE=
+ WITH_HKP_FALSE='#'
+ else
+@@ -22059,9 +22056,7 @@
+
+
+
+-
+-
+-if test "$with_keyserver" = "yes"; then
++ if test "$with_keyserver" = "yes"; then
+ WITH_KEYSERVER_TRUE=
+ WITH_KEYSERVER_FALSE='#'
+ else
+@@ -22180,9 +22175,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$with_nautilus_ext" = "yes"; then
++ if test "$with_nautilus_ext" = "yes"; then
+ WITH_NAUTILUS_EXT_TRUE=
+ WITH_NAUTILUS_EXT_FALSE='#'
+ else
+@@ -22218,9 +22211,7 @@
+
+ fi
+
+-
+-
+-if test "$enable_agent" != "no"; then
++ if test "$enable_agent" != "no"; then
+ WITH_AGENT_TRUE=
+ WITH_AGENT_FALSE='#'
+ else
+@@ -22327,9 +22318,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$enable_gnome_keyring" = "yes"; then
++ if test "$enable_gnome_keyring" = "yes"; then
+ WITH_GNOME_KEYRING_TRUE=
+ WITH_GNOME_KEYRING_FALSE='#'
+ else
+@@ -22443,9 +22432,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$enable_sharing" = "yes"; then
++ if test "$enable_sharing" = "yes"; then
+ WITH_SHARING_TRUE=
+ WITH_SHARING_FALSE='#'
+ else
+@@ -22872,9 +22859,7 @@
+
+ fi
+
+-
+-
+-if test "$gecko_cv_gecko_flavour" = "toolkit"; then
++ if test "$gecko_cv_gecko_flavour" = "toolkit"; then
+ HAVE_MOZILLA_TOOLKIT_TRUE=
+ HAVE_MOZILLA_TOOLKIT_FALSE='#'
+ else
+@@ -23152,9 +23137,7 @@
+
+ fi # if gecko_cv_have_gecko
+
+-
+-
+-if test "$gecko_cv_have_debug" = "yes"; then
++ if test "$gecko_cv_have_debug" = "yes"; then
+ HAVE_GECKO_DEBUG_TRUE=
+ HAVE_GECKO_DEBUG_FALSE='#'
+ else
+@@ -23326,9 +23309,7 @@
+
+ fi # if gecko_cv_have_gecko
+
+-
+-
+-if test "$gecko_cv_gecko_version_int" -ge "1007000"; then
++ if test "$gecko_cv_gecko_version_int" -ge "1007000"; then
+ HAVE_GECKO_1_7_TRUE=
+ HAVE_GECKO_1_7_FALSE='#'
+ else
+@@ -23336,9 +23317,7 @@
+ HAVE_GECKO_1_7_FALSE=
+ fi
+
+-
+-
+-if test "$gecko_cv_gecko_version_int" -ge "1008000"; then
++ if test "$gecko_cv_gecko_version_int" -ge "1008000"; then
+ HAVE_GECKO_1_8_TRUE=
+ HAVE_GECKO_1_8_FALSE='#'
+ else
+@@ -23346,9 +23325,7 @@
+ HAVE_GECKO_1_8_FALSE=
+ fi
+
+-
+-
+-if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
++ if test "$gecko_cv_gecko_version_int" -ge "1008001"; then
+ HAVE_GECKO_1_8_1_TRUE=
+ HAVE_GECKO_1_8_1_FALSE='#'
+ else
+@@ -23356,9 +23333,7 @@
+ HAVE_GECKO_1_8_1_FALSE=
+ fi
+
+-
+-
+-if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
++ if test "$gecko_cv_gecko_version_int" -ge "1009000"; then
+ HAVE_GECKO_1_9_TRUE=
+ HAVE_GECKO_1_9_FALSE='#'
+ else
+@@ -27239,9 +27214,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$with_epiphany_plugin" = "yes"; then
++ if test "$with_epiphany_plugin" = "yes"; then
+ WITH_EPIPHANY_TRUE=
+ WITH_EPIPHANY_FALSE='#'
+ else
+@@ -31711,9 +31684,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$enable_gedit" = "yes"; then
++ if test "$enable_gedit" = "yes"; then
+ WITH_GEDIT_TRUE=
+ WITH_GEDIT_FALSE='#'
+ else
+@@ -31721,9 +31692,7 @@
+ WITH_GEDIT_FALSE=
+ fi
+
+-
+-
+-if test "$with_gedit_bonobo" = "yes"; then
++ if test "$with_gedit_bonobo" = "yes"; then
+ WITH_GEDIT_BONOBO_TRUE=
+ WITH_GEDIT_BONOBO_FALSE='#'
+ else
+@@ -31842,9 +31811,7 @@
+ fi
+ fi
+
+-
+-
+-if test "$enable_applet" = "yes"; then
++ if test "$enable_applet" = "yes"; then
+ WITH_APPLET_TRUE=
+ WITH_APPLET_FALSE='#'
+ else
+@@ -31962,133 +31929,13 @@
+ echo "disabling ssh support"
+ else
+
+- # Extract the first word of "ssh-keygen", so it can be a program name with args.
+-set dummy ssh-keygen; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SSH_KEYGEN_PATH+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $SSH_KEYGEN_PATH in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SSH_KEYGEN_PATH="$SSH_KEYGEN_PATH" # 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_SSH_KEYGEN_PATH="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_SSH_KEYGEN_PATH" && ac_cv_path_SSH_KEYGEN_PATH=""failed""
+- ;;
+-esac
+-fi
+-SSH_KEYGEN_PATH=$ac_cv_path_SSH_KEYGEN_PATH
+-if test -n "$SSH_KEYGEN_PATH"; then
+- { echo "$as_me:$LINENO: result: $SSH_KEYGEN_PATH" >&5
+-echo "${ECHO_T}$SSH_KEYGEN_PATH" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- # Extract the first word of "ssh-add", so it can be a program name with args.
+-set dummy ssh-add; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SSH_ADD_PATH+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $SSH_ADD_PATH in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SSH_ADD_PATH="$SSH_ADD_PATH" # 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_SSH_ADD_PATH="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_SSH_ADD_PATH" && ac_cv_path_SSH_ADD_PATH=""failed""
+- ;;
+-esac
+-fi
+-SSH_ADD_PATH=$ac_cv_path_SSH_ADD_PATH
+-if test -n "$SSH_ADD_PATH"; then
+- { echo "$as_me:$LINENO: result: $SSH_ADD_PATH" >&5
+-echo "${ECHO_T}$SSH_ADD_PATH" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+- # Extract the first word of "ssh", so it can be a program name with args.
+-set dummy ssh; ac_word=$2
+-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_SSH_PATH+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- case $SSH_PATH in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_SSH_PATH="$SSH_PATH" # 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_SSH_PATH="$as_dir/$ac_word$ac_exec_ext"
+- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_SSH_PATH" && ac_cv_path_SSH_PATH=""failed""
+- ;;
+-esac
+-fi
+-SSH_PATH=$ac_cv_path_SSH_PATH
+-if test -n "$SSH_PATH"; then
+- { echo "$as_me:$LINENO: result: $SSH_PATH" >&5
+-echo "${ECHO_T}$SSH_PATH" >&6; }
+-else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
+-
+-
+- if test $SSH_KEYGEN_PATH != "failed" &&
+- test $SSH_PATH != "failed" &&
+- test $SSH_ADD_PATH != "failed"; then
++# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
++# AC_PATH_PROG(SSH_ADD_PATH, ssh-add, "failed")
++# AC_PATH_PROG(SSH_PATH, ssh, "failed")
++
++# if test $SSH_KEYGEN_PATH != "failed" &&
++# test $SSH_PATH != "failed" &&
++# test $SSH_ADD_PATH != "failed"; then
+ enable_ssh="yes"
+
+ cat >>confdefs.h <<\_ACEOF
+@@ -32097,26 +31944,24 @@
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define SSH_KEYGEN_PATH "$SSH_KEYGEN_PATH"
++#define SSH_KEYGEN_PATH "/usr/bin/ssh-keygen"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define SSH_PATH "$SSH_PATH"
++#define SSH_PATH "/usr/bin/ssh"
+ _ACEOF
+
+
+ cat >>confdefs.h <<_ACEOF
+-#define SSH_ADD_PATH "$SSH_ADD_PATH"
++#define SSH_ADD_PATH "/usr/bin/ssh-add"
+ _ACEOF
+
+- fi
++# fi
+
+ fi
+
+-
+-
+-if test "$enable_ssh" == "yes"; then
++ if test "$enable_ssh" == "yes"; then
+ WITH_SSH_TRUE=
+ WITH_SSH_FALSE='#'
+ else
+@@ -32174,9 +32019,7 @@
+ enable_tests="no"
+ fi
+
+-
+-
+-if test "$enable_tests" == "yes"; then
++ if test "$enable_tests" == "yes"; then
+ WITH_TESTS_TRUE=
+ WITH_TESTS_FALSE='#'
+ else
+@@ -32235,9 +32078,7 @@
+ enableval=$enable_update_mime_database;
+ fi
+
+-
+-
+-if test "$enable_update_mime_database" != "no"; then
++ if test "$enable_update_mime_database" != "no"; then
+ UPDATE_MIME_DATABASE_TRUE=
+ UPDATE_MIME_DATABASE_FALSE='#'
+ else
+@@ -34449,6 +34290,7 @@
+ ac_pwd='$ac_pwd'
+ srcdir='$srcdir'
+ INSTALL='$INSTALL'
++MKDIR_P='$MKDIR_P'
+ _ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -34692,6 +34534,7 @@
+ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+ INSTALL_DATA!$INSTALL_DATA$ac_delim
++am__isrc!$am__isrc$ac_delim
+ CYGPATH_W!$CYGPATH_W$ac_delim
+ PACKAGE!$PACKAGE$ac_delim
+ VERSION!$VERSION$ac_delim
+@@ -34748,7 +34591,6 @@
+ EXEEXT!$EXEEXT$ac_delim
+ OBJEXT!$OBJEXT$ac_delim
+ DEPDIR!$DEPDIR$ac_delim
+-am__include!$am__include$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -34790,6 +34632,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++am__include!$am__include$ac_delim
+ am__quote!$am__quote$ac_delim
+ AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+ AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+@@ -34886,7 +34729,6 @@
+ HAVE_MOZILLA_TOOLKIT_FALSE!$HAVE_MOZILLA_TOOLKIT_FALSE$ac_delim
+ HAVE_GECKO_DEBUG_TRUE!$HAVE_GECKO_DEBUG_TRUE$ac_delim
+ HAVE_GECKO_DEBUG_FALSE!$HAVE_GECKO_DEBUG_FALSE$ac_delim
+-HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -34928,6 +34770,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++HAVE_GECKO_1_7_TRUE!$HAVE_GECKO_1_7_TRUE$ac_delim
+ HAVE_GECKO_1_7_FALSE!$HAVE_GECKO_1_7_FALSE$ac_delim
+ HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim
+ HAVE_GECKO_1_8_FALSE!$HAVE_GECKO_1_8_FALSE$ac_delim
+@@ -34962,9 +34805,6 @@
+ WITH_APPLET_FALSE!$WITH_APPLET_FALSE$ac_delim
+ LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim
+ LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim
+-SSH_KEYGEN_PATH!$SSH_KEYGEN_PATH$ac_delim
+-SSH_ADD_PATH!$SSH_ADD_PATH$ac_delim
+-SSH_PATH!$SSH_PATH$ac_delim
+ WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim
+ WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim
+ WITH_TESTS_TRUE!$WITH_TESTS_TRUE$ac_delim
+@@ -34992,7 +34832,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 60; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -35219,6 +35059,11 @@
+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+ esac
++ ac_MKDIR_P=$MKDIR_P
++ case $MKDIR_P in
++ [\\/$]* | ?:[\\/]* ) ;;
++ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
++ esac
+ _ACEOF
+
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -35272,6 +35117,7 @@
+ s&@abs_builddir@&$ac_abs_builddir&;t t
+ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+ s&@INSTALL@&$ac_INSTALL&;t t
++s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ " $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out
+
+@@ -35436,8 +35282,9 @@
+ # some people rename them; so instead we look at the file content.
+ # Grep'ing the first line is not enough: some people post-process
+ # each Makefile.in and add a new line on top of each file to say so.
+- # So let's grep whole file.
+- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
+ dirpart=`$as_dirname -- "$mf" ||
+ $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$mf" : 'X\(//\)[^/]' \| \
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/daemon/Makefile.in seahorse-1.0.1/daemon/Makefile.in
+--- seahorse-1.0.1-old/daemon/Makefile.in 2007-04-03 18:17:44.000000000 +0200
++++ seahorse-1.0.1/daemon/Makefile.in 2007-05-01 22:57:36.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,17 +65,18 @@
+ seahorse_daemon_DEPENDENCIES = \
+ $(top_builddir)/libseahorse/libseahorse.a \
+ $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(seahorse_daemon_SOURCES)
+ DIST_SOURCES = $(am__seahorse_daemon_SOURCES_DIST)
+ man1dir = $(mandir)/man1
+@@ -101,8 +98,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -133,8 +128,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -148,8 +141,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -165,23 +156,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -227,9 +203,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -244,8 +219,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -254,8 +227,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -270,48 +241,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -323,6 +263,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -350,8 +291,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ gladedir = $(datadir)/seahorse/glade/
+ pixmapsdir = $(datadir)/pixmaps/
+ INCLUDES = -I$(top_builddir) \
+@@ -440,7 +384,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -468,7 +412,7 @@
+ done
+ seahorse-daemon$(EXEEXT): $(seahorse_daemon_OBJECTS) $(seahorse_daemon_DEPENDENCIES)
+ @rm -f seahorse-daemon$(EXEEXT)
+- $(LINK) $(seahorse_daemon_LDFLAGS) $(seahorse_daemon_OBJECTS) $(seahorse_daemon_LDADD) $(LIBS)
++ $(LINK) $(seahorse_daemon_OBJECTS) $(seahorse_daemon_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -485,22 +429,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-sharing.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -510,13 +454,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -561,7 +501,7 @@
+ done
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -578,7 +518,7 @@
+ done
+ install-serviceDATA: $(service_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(servicedir)" || $(mkdir_p) "$(DESTDIR)$(servicedir)"
++ test -z "$(servicedir)" || $(MKDIR_P) "$(DESTDIR)$(servicedir)"
+ @list='$(service_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -643,22 +583,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -675,7 +614,7 @@
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(servicedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+@@ -713,7 +652,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -727,14 +666,22 @@
+
+ install-data-am: install-gladeDATA install-man install-serviceDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man: install-man1
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -755,25 +702,28 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA \
+- uninstall-info-am uninstall-man uninstall-serviceDATA
++uninstall-am: uninstall-binPROGRAMS uninstall-gladeDATA uninstall-man \
++ uninstall-serviceDATA
+
+ uninstall-man: uninstall-man1
+
++.MAKE: install-am install-exec-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-binPROGRAMS install-data install-data-am install-exec \
+- install-exec-am install-exec-hook install-gladeDATA \
+- install-info install-info-am install-man install-man1 \
+- install-serviceDATA install-strip installcheck installcheck-am \
+- installdirs maintainer-clean maintainer-clean-generic \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
+- uninstall-am uninstall-binPROGRAMS uninstall-gladeDATA \
+- uninstall-info-am uninstall-man uninstall-man1 \
+- uninstall-serviceDATA
++ install-binPROGRAMS install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-exec-hook \
++ install-gladeDATA install-html install-html-am install-info \
++ install-info-am install-man install-man1 install-pdf \
++ install-pdf-am install-ps install-ps-am install-serviceDATA \
++ install-strip installcheck installcheck-am installdirs \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++ pdf pdf-am ps ps-am tags uninstall uninstall-am \
++ uninstall-binPROGRAMS uninstall-gladeDATA uninstall-man \
++ uninstall-man1 uninstall-serviceDATA
+
+
+ # DBUS binding files
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/data/Makefile.in seahorse-1.0.1/data/Makefile.in
+--- seahorse-1.0.1-old/data/Makefile.in 2007-04-03 18:17:44.000000000 +0200
++++ seahorse-1.0.1/data/Makefile.in 2007-05-01 22:57:36.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -64,8 +60,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -96,8 +90,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -111,8 +103,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -128,23 +118,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -190,9 +165,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -207,8 +181,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -217,8 +189,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -233,48 +203,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -286,6 +225,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -313,8 +253,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+ schemas_in_files = seahorse.schemas.in
+ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
+@@ -358,13 +301,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-schemasDATA: $(schemas_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
++ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
+ @list='$(schemas_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -387,22 +326,21 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -418,7 +356,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(schemasdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -451,7 +389,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -465,12 +403,20 @@
+
+ install-data-am: install-data-local install-schemasDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -489,18 +435,21 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-schemasDATA
++uninstall-am: uninstall-schemasDATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-data install-data-am install-data-local install-exec \
+- install-exec-am install-info install-info-am install-man \
++ install-data install-data-am install-data-local install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
+ install-schemasDATA install-strip installcheck installcheck-am \
+ installdirs maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+- ps ps-am uninstall uninstall-am uninstall-info-am \
+- uninstall-schemasDATA
++ ps ps-am uninstall uninstall-am uninstall-schemasDATA
+
+
+ @INTLTOOL_SCHEMAS_RULE@
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/depcomp seahorse-1.0.1/depcomp
+--- seahorse-1.0.1-old/depcomp 2007-03-17 21:34:35.000000000 +0100
++++ seahorse-1.0.1/depcomp 2007-05-01 22:57:42.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2006-10-15.18
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
++# Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -91,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -276,6 +290,46 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +342,13 @@
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/help/Makefile.in seahorse-1.0.1/help/Makefile.in
+--- seahorse-1.0.1-old/help/Makefile.in 2007-04-03 18:17:44.000000000 +0200
++++ seahorse-1.0.1/help/Makefile.in 2007-05-01 22:57:37.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ # the same distribution terms that you use for the rest of that program.
+
+ ################################################################################
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -79,8 +75,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,8 +105,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -126,8 +118,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -143,23 +133,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -205,9 +180,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -222,8 +196,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -232,8 +204,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -248,48 +218,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -301,6 +240,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -328,8 +268,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
+ _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
+@@ -489,10 +432,6 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -501,23 +440,21 @@
+
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/..
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -565,8 +502,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+- distclean-local
++distclean-am: clean-am distclean-generic distclean-local
+
+ dvi: dvi-am
+
+@@ -580,12 +516,20 @@
+
+ install-data-am: install-data-local
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -606,19 +550,22 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distclean-local distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-local mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-info-am uninstall-local
++ install-data-am install-data-local install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic maintainer-clean-local mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
++ pdf-am ps ps-am uninstall uninstall-am uninstall-local
+
+
+ DOC_H_FILE ?=
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/install-sh seahorse-1.0.1/install-sh
+--- seahorse-1.0.1-old/install-sh 2007-03-17 21:34:31.000000000 +0100
++++ seahorse-1.0.1/install-sh 2007-05-01 22:57:35.000000000 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2005-05-14.22
++scriptversion=2006-10-14.15
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -39,15 +39,24 @@
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
+
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+ mvprog="${MVPROG-mv}"
+ cpprog="${CPPROG-cp}"
+@@ -58,7 +67,13 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+
+-chmodcmd="$chmodprog 0755"
++posix_glob=
++posix_mkdir=
++
++# Desired mode of installed file.
++mode=0755
++
++chmodcmd=$chmodprog
+ chowncmd=
+ chgrpcmd=
+ stripcmd=
+@@ -95,7 +110,7 @@
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ "
+
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
+@@ -111,9 +126,15 @@
+
+ --help) echo "$usage"; exit $?;;
+
+- -m) chmodcmd="$chmodprog $2"
++ -m) mode=$2
+ shift
+ shift
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+@@ -136,25 +157,33 @@
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # When -d is used, all remaining arguments are directories to create.
+- # When -t is used, the destination is already specified.
+- test -n "$dir_arg$dstarg" && break
+- # Otherwise, the last argument is the destination. Remove it from $@.
+- for arg
+- do
+- if test -n "$dstarg"; then
+- # $@ is not empty: it contains at least $arg.
+- set fnord "$@" "$dstarg"
+- shift # fnord
+- fi
+- shift # arg
+- dstarg=$arg
+- done
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
+ done
+
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -164,6 +193,33 @@
+ exit 0
+ fi
+
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
++
+ for src
+ do
+ # Protect names starting with `-'.
+@@ -173,15 +229,11 @@
+
+ if test -n "$dir_arg"; then
+ dst=$src
+- src=
+-
+- if test -d "$dst"; then
+- mkdircmd=:
+- chmodcmd=
+- else
+- mkdircmd=$mkdirprog
+- fi
++ dstdir=$dst
++ test -d "$dstdir"
++ dstdir_status=$?
+ else
++
+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+ # might cause directories to be created, which would be especially bad
+ # if $src (and thus $dsttmp) contains '*'.
+@@ -208,53 +260,188 @@
+ echo "$0: $dstarg: Is a directory" >&2
+ exit 1
+ fi
+- dst=$dst/`basename "$src"`
++ dstdir=$dst
++ dst=$dstdir/`basename "$src"`
++ dstdir_status=0
++ else
++ # Prefer dirname, but fall back on a substitute if dirname fails.
++ dstdir=`
++ (dirname "$dst") 2>/dev/null ||
++ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++ X"$dst" : 'X\(//\)[^/]' \| \
++ X"$dst" : 'X\(//\)$' \| \
++ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
++ echo X"$dst" |
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
++ `
++
++ test -d "$dstdir"
++ dstdir_status=$?
+ fi
+ fi
+
+- # This sed command emulates the dirname command.
+- dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+-
+- # Make sure that the destination directory exists.
++ obsolete_mkdir_used=false
+
+- # Skip lots of stat calls in the usual case.
+- if test ! -d "$dstdir"; then
+- defaultIFS='
+- '
+- IFS="${IFS-$defaultIFS}"
+-
+- oIFS=$IFS
+- # Some sh's can't handle IFS=/ for some reason.
+- IFS='%'
+- set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+- shift
+- IFS=$oIFS
++ if test $dstdir_status != 0; then
++ case $posix_mkdir in
++ '')
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
++
++ # With -d, create the new directory with the user-specified mode.
++ # Otherwise, rely on $mkdir_umask.
++ if test -n "$dir_arg"; then
++ mkdir_mode=-m$mode
++ else
++ mkdir_mode=
++ fi
++
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
+
+- pathcomp=
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
++ then :
++ else
+
+- while test $# -ne 0 ; do
+- pathcomp=$pathcomp$1
++ # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # or it failed possibly due to a race condition. Create the
++ # directory the slow way, step by step, checking for races as we go.
++
++ case $dstdir in
++ /*) prefix=/ ;;
++ -*) prefix=./ ;;
++ *) prefix= ;;
++ esac
++
++ case $posix_glob in
++ '')
++ if (set -f) 2>/dev/null; then
++ posix_glob=true
++ else
++ posix_glob=false
++ fi ;;
++ esac
++
++ oIFS=$IFS
++ IFS=/
++ $posix_glob && set -f
++ set fnord $dstdir
+ shift
+- if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
+- # mkdir can fail with a `File exist' error in case several
+- # install-sh are creating the directory concurrently. This
+- # is OK.
+- test -d "$pathcomp" || exit
++ $posix_glob && set +f
++ IFS=$oIFS
++
++ prefixes=
++
++ for d
++ do
++ test -z "$d" && continue
++
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
++ fi
++ prefix=$prefix/
++ done
++
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
+ fi
+- pathcomp=$pathcomp/
+- done
++ fi
+ fi
+
+ if test -n "$dir_arg"; then
+- $doit $mkdircmd "$dst" \
+- && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+- && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+- && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+-
++ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
++ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
++ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+- dstfile=`basename "$dst"`
+
+ # Make a couple of temp file names in the proper directory.
+ dsttmp=$dstdir/_inst.$$_
+@@ -262,10 +449,9 @@
+
+ # Trap to clean up those temp files at exit.
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+- trap '(exit $?); exit' 1 2 13 15
+
+ # Copy the file name to the temp name.
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -276,10 +462,10 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+- { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
++ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ || {
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+@@ -291,11 +477,12 @@
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+- if test -f "$dstdir/$dstfile"; then
+- $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+- || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
++ if test -f "$dst"; then
++ $doit $rmcmd -f "$dst" 2>/dev/null \
++ || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
++ && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ || {
+- echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++ echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ else
+@@ -304,16 +491,13 @@
+ } &&
+
+ # Now rename the file to the real destination.
+- $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++ $doit $mvcmd "$dsttmp" "$dst"
+ }
+- }
+- fi || { (exit 1); exit 1; }
+-done
++ } || exit 1
+
+-# The final little trick to "correctly" pass the exit status to the exit trap.
+-{
+- (exit 0); exit 0
+-}
++ trap '' 0
++ fi
++done
+
+ # Local variables:
+ # eval: (add-hook 'write-file-hooks 'time-stamp)
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/libcryptui/Makefile.in seahorse-1.0.1/libcryptui/Makefile.in
+--- seahorse-1.0.1-old/libcryptui/Makefile.in 2007-04-03 18:17:45.000000000 +0200
++++ seahorse-1.0.1/libcryptui/Makefile.in 2007-05-01 22:57:37.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,29 +64,36 @@
+ cryptui-key-store.lo cryptui-key-combo.lo cryptui-key-list.lo \
+ cryptui-key-chooser.lo $(am__objects_1)
+ libcryptui_la_OBJECTS = $(am_libcryptui_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++libcryptui_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libcryptui_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libcryptui_la_SOURCES)
+ DIST_SOURCES = $(libcryptui_la_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
+ pkgconfigDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(pkgconfig_DATA)
+ incHEADERS_INSTALL = $(INSTALL_HEADER)
+ HEADERS = $(inc_HEADERS)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = . tests
+@@ -99,8 +102,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -131,8 +132,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -146,8 +145,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -163,23 +160,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -225,9 +207,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -242,8 +223,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -252,8 +231,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -268,48 +245,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -321,6 +267,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -348,8 +295,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @WITH_TESTS_FALSE at TESTS_DIR =
+ @WITH_TESTS_TRUE at TESTS_DIR = tests
+ SUBDIRS = . $(TESTS_DIR)
+@@ -434,7 +384,7 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
++ test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+@@ -445,7 +395,7 @@
+
+ uninstall-libLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+@@ -460,7 +410,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libcryptui.la: $(libcryptui_la_OBJECTS) $(libcryptui_la_DEPENDENCIES)
+- $(LINK) -rpath $(libdir) $(libcryptui_la_LDFLAGS) $(libcryptui_la_OBJECTS) $(libcryptui_la_LIBADD) $(LIBS)
++ $(libcryptui_la_LINK) -rpath $(libdir) $(libcryptui_la_OBJECTS) $(libcryptui_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -477,22 +427,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cryptui.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -502,13 +452,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
++ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
+ @list='$(pkgconfig_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -525,7 +471,7 @@
+ done
+ install-incHEADERS: $(inc_HEADERS)
+ @$(NORMAL_INSTALL)
+- test -z "$(incdir)" || $(mkdir_p) "$(DESTDIR)$(incdir)"
++ test -z "$(incdir)" || $(MKDIR_P) "$(DESTDIR)$(incdir)"
+ @list='$(inc_HEADERS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -572,8 +518,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -674,22 +619,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -703,7 +647,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -711,6 +655,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -722,7 +668,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(incdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-recursive
+@@ -760,7 +706,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -774,12 +720,20 @@
+
+ install-data-am: install-incHEADERS install-pkgconfigDATA
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am: install-libLTLIBRARIES
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -800,27 +754,29 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-incHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
++uninstall-am: uninstall-incHEADERS uninstall-libLTLIBRARIES \
++ uninstall-pkgconfigDATA
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libLTLIBRARIES clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
+- distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic \
++ clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
++ distclean distclean-compile distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am \
+ install-incHEADERS install-info install-info-am \
+- install-libLTLIBRARIES install-man install-pkgconfigDATA \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
++ install-pkgconfigDATA install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-incHEADERS uninstall-info-am \
+- uninstall-libLTLIBRARIES uninstall-pkgconfigDATA
++ uninstall-incHEADERS uninstall-libLTLIBRARIES \
++ uninstall-pkgconfigDATA
+
+
+ cryptui-marshal.h: cryptui-marshal.list $(GLIB_GENMARSHAL)
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/libcryptui/tests/Makefile.in seahorse-1.0.1/libcryptui/tests/Makefile.in
+--- seahorse-1.0.1-old/libcryptui/tests/Makefile.in 2007-04-03 18:17:45.000000000 +0200
++++ seahorse-1.0.1/libcryptui/tests/Makefile.in 2007-05-01 22:57:38.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -61,17 +57,18 @@
+ cryptui_test_ui_OBJECTS = $(am_cryptui_test_ui_OBJECTS)
+ cryptui_test_ui_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(top_builddir)/libcryptui/libcryptui.la
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(cryptui_test_keyset_SOURCES) $(cryptui_test_ui_SOURCES)
+ DIST_SOURCES = $(cryptui_test_keyset_SOURCES) \
+ $(cryptui_test_ui_SOURCES)
+@@ -82,8 +79,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -114,8 +109,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -129,8 +122,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -146,23 +137,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -208,9 +184,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -225,8 +200,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -235,8 +208,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -251,48 +222,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -304,6 +244,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -331,8 +272,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/libcryptui \
+@@ -382,7 +326,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -410,10 +354,10 @@
+ done
+ cryptui-test-keyset$(EXEEXT): $(cryptui_test_keyset_OBJECTS) $(cryptui_test_keyset_DEPENDENCIES)
+ @rm -f cryptui-test-keyset$(EXEEXT)
+- $(LINK) $(cryptui_test_keyset_LDFLAGS) $(cryptui_test_keyset_OBJECTS) $(cryptui_test_keyset_LDADD) $(LIBS)
++ $(LINK) $(cryptui_test_keyset_OBJECTS) $(cryptui_test_keyset_LDADD) $(LIBS)
+ cryptui-test-ui$(EXEEXT): $(cryptui_test_ui_OBJECTS) $(cryptui_test_ui_DEPENDENCIES)
+ @rm -f cryptui-test-ui$(EXEEXT)
+- $(LINK) $(cryptui_test_ui_LDFLAGS) $(cryptui_test_ui_OBJECTS) $(cryptui_test_ui_LDADD) $(LIBS)
++ $(LINK) $(cryptui_test_ui_OBJECTS) $(cryptui_test_ui_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -425,22 +369,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/cryptui-test-ui.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -451,10 +395,6 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -504,22 +444,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -535,7 +474,7 @@
+ all-am: Makefile $(PROGRAMS)
+ installdirs:
+ for dir in "$(DESTDIR)$(bindir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -569,7 +508,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -583,12 +522,20 @@
+
+ install-data-am:
+
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -609,19 +556,23 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
++uninstall-am: uninstall-binPROGRAMS
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+- install-binPROGRAMS install-data install-data-am install-exec \
+- install-exec-am install-info install-info-am install-man \
++ install-binPROGRAMS install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-info-am
++ uninstall-binPROGRAMS
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/libseahorse/Makefile.in seahorse-1.0.1/libseahorse/Makefile.in
+--- seahorse-1.0.1-old/libseahorse/Makefile.in 2007-04-03 18:17:45.000000000 +0200
++++ seahorse-1.0.1/libseahorse/Makefile.in 2007-05-01 22:57:38.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -16,15 +16,11 @@
+
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -139,17 +135,18 @@
+ am_xloadimage_OBJECTS = seahorse-xloadimage.$(OBJEXT)
+ xloadimage_OBJECTS = $(am_xloadimage_OBJECTS)
+ xloadimage_LDADD = $(LDADD)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libseahorse_a_SOURCES) $(seahorse_ssh_askpass_SOURCES) \
+ $(xloadimage_SOURCES)
+ DIST_SOURCES = $(am__libseahorse_a_SOURCES_DIST) \
+@@ -169,8 +166,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -201,8 +196,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -216,8 +209,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -233,23 +224,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -295,9 +271,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -312,8 +287,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -322,8 +295,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -338,48 +309,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -391,6 +331,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -418,8 +359,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ gladedir = $(datadir)/seahorse/glade/
+ pixmapsdir = $(datadir)/pixmaps/seahorse/
+ seahorselibexecbindir = $(libdir)/seahorse/
+@@ -557,7 +501,7 @@
+ $(RANLIB) libseahorse.a
+ install-seahorselibexecbinPROGRAMS: $(seahorselibexecbin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(seahorselibexecbindir)" || $(mkdir_p) "$(DESTDIR)$(seahorselibexecbindir)"
++ test -z "$(seahorselibexecbindir)" || $(MKDIR_P) "$(DESTDIR)$(seahorselibexecbindir)"
+ @list='$(seahorselibexecbin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -585,10 +529,10 @@
+ done
+ seahorse-ssh-askpass$(EXEEXT): $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_DEPENDENCIES)
+ @rm -f seahorse-ssh-askpass$(EXEEXT)
+- $(LINK) $(seahorse_ssh_askpass_LDFLAGS) $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_LDADD) $(LIBS)
++ $(LINK) $(seahorse_ssh_askpass_OBJECTS) $(seahorse_ssh_askpass_LDADD) $(LIBS)
+ xloadimage$(EXEEXT): $(xloadimage_OBJECTS) $(xloadimage_DEPENDENCIES)
+ @rm -f xloadimage$(EXEEXT)
+- $(LINK) $(xloadimage_LDFLAGS) $(xloadimage_OBJECTS) $(xloadimage_LDADD) $(LIBS)
++ $(LINK) $(xloadimage_OBJECTS) $(xloadimage_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -644,36 +588,36 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-xloadimage.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ seahorse-xloadimage.o: ../src/seahorse-xloadimage.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.o -MD -MP -MF "$(DEPDIR)/seahorse-xloadimage.Tpo" -c -o seahorse-xloadimage.o `test -f '../src/seahorse-xloadimage.c' || echo '$(srcdir)/'`../src/seahorse-xloadimage.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/seahorse-xloadimage.Tpo" "$(DEPDIR)/seahorse-xloadimage.Po"; else rm -f "$(DEPDIR)/seahorse-xloadimage.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.o -MD -MP -MF $(DEPDIR)/seahorse-xloadimage.Tpo -c -o seahorse-xloadimage.o `test -f '../src/seahorse-xloadimage.c' || echo '$(srcdir)/'`../src/seahorse-xloadimage.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/seahorse-xloadimage.Tpo $(DEPDIR)/seahorse-xloadimage.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../src/seahorse-xloadimage.c' object='seahorse-xloadimage.o' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seahorse-xloadimage.o `test -f '../src/seahorse-xloadimage.c' || echo '$(srcdir)/'`../src/seahorse-xloadimage.c
+
+ seahorse-xloadimage.obj: ../src/seahorse-xloadimage.c
+- at am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.obj -MD -MP -MF "$(DEPDIR)/seahorse-xloadimage.Tpo" -c -o seahorse-xloadimage.obj `if test -f '../src/seahorse-xloadimage.c'; then $(CYGPATH_W) '../src/seahorse-xloadimage.c'; else $(CYGPATH_W) '$(srcdir)/../src/seahorse-xloadimage.c'; fi`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/seahorse-xloadimage.Tpo" "$(DEPDIR)/seahorse-xloadimage.Po"; else rm -f "$(DEPDIR)/seahorse-xloadimage.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT seahorse-xloadimage.obj -MD -MP -MF $(DEPDIR)/seahorse-xloadimage.Tpo -c -o seahorse-xloadimage.obj `if test -f '../src/seahorse-xloadimage.c'; then $(CYGPATH_W) '../src/seahorse-xloadimage.c'; else $(CYGPATH_W) '$(srcdir)/../src/seahorse-xloadimage.c'; fi`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/seahorse-xloadimage.Tpo $(DEPDIR)/seahorse-xloadimage.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../src/seahorse-xloadimage.c' object='seahorse-xloadimage.obj' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o seahorse-xloadimage.obj `if test -f '../src/seahorse-xloadimage.c'; then $(CYGPATH_W) '../src/seahorse-xloadimage.c'; else $(CYGPATH_W) '$(srcdir)/../src/seahorse-xloadimage.c'; fi`
+@@ -683,13 +627,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -754,22 +694,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -786,7 +725,7 @@
+ all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(seahorselibexecbindir)" "$(DESTDIR)$(gladedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+@@ -823,7 +762,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -837,12 +776,20 @@
+
+ install-data-am: install-gladeDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am: install-seahorselibexecbinPROGRAMS
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -863,22 +810,25 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-gladeDATA uninstall-info-am \
+- uninstall-seahorselibexecbinPROGRAMS
++uninstall-am: uninstall-gladeDATA uninstall-seahorselibexecbinPROGRAMS
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLIBRARIES \
+ clean-seahorselibexecbinPROGRAMS ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-exec \
+- install-exec-am install-gladeDATA install-info install-info-am \
+- install-man install-seahorselibexecbinPROGRAMS install-strip \
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-gladeDATA \
++ install-html install-html-am install-info install-info-am \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-seahorselibexecbinPROGRAMS install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags uninstall uninstall-am uninstall-gladeDATA \
+- uninstall-info-am uninstall-seahorselibexecbinPROGRAMS
++ uninstall-seahorselibexecbinPROGRAMS
+
+
+ seahorse-marshal.h: seahorse-marshal.list $(GLIB_GENMARSHAL)
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/Makefile.in seahorse-1.0.1/Makefile.in
+--- seahorse-1.0.1-old/Makefile.in 2007-04-03 18:17:49.000000000 +0200
++++ seahorse-1.0.1/Makefile.in 2007-05-01 22:57:43.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = .
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -35,13 +31,13 @@
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
++subdir = .
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ $(srcdir)/seahorse.spec.in $(top_srcdir)/configure AUTHORS \
+ COPYING ChangeLog INSTALL NEWS THANKS TODO compile \
+ config.guess config.sub depcomp install-sh ltmain.sh missing \
+ mkinstalldirs
+-subdir = .
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/epiphany.m4 \
+ $(top_srcdir)/m4/gecko.m4 $(top_srcdir)/m4/gnome-doc-utils.m4 \
+@@ -50,7 +46,7 @@
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+- configure.lineno configure.status.lineno
++ configure.lineno config.status.lineno
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+ CONFIG_CLEAN_FILES = seahorse.spec
+@@ -58,10 +54,13 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = libcryptui libseahorse src po data help pixmaps plugins \
+@@ -81,8 +80,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -113,8 +110,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -128,8 +123,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -145,23 +138,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -207,9 +185,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -224,8 +201,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -234,8 +209,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -250,48 +223,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -303,6 +245,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -330,8 +273,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ ACLOCAL_AMFLAGS = -I m4
+ @WITH_AGENT_FALSE at AGENT_DIR =
+ @WITH_AGENT_TRUE at AGENT_DIR = agent
+@@ -418,7 +364,7 @@
+ config.h: stamp-h1
+ @if test ! -f $@; then \
+ rm -f stamp-h1; \
+- $(MAKE) stamp-h1; \
++ $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
+ else :; fi
+
+ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+@@ -442,7 +388,6 @@
+
+ distclean-libtool:
+ -rm -f libtool
+-uninstall-info-am:
+
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -475,8 +420,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -578,24 +522,22 @@
+
+ distdir: $(DISTFILES)
+ $(am__remove_distdir)
+- mkdir $(distdir)
+- $(mkdir_p) $(distdir)/. $(distdir)/libcryptui $(distdir)/m4 $(distdir)/po $(distdir)/src
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ test -d $(distdir) || mkdir $(distdir)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -609,7 +551,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -617,6 +559,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -624,7 +568,7 @@
+ -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -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 $(SHELL) $(install_sh) -c -m a+r {} {} \; \
++ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+ || chmod -R a+r $(distdir)
+ dist-gzip: distdir
+ tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+@@ -699,7 +643,7 @@
+ $(am__remove_distdir)
+ @(echo "$(distdir) archives ready for distribution: "; \
+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
+- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
+ distcleancheck: distclean
+ @if test '$(srcdir)' = . ; then \
+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
+@@ -761,12 +705,20 @@
+
+ install-data-am:
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -787,24 +739,26 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am
++uninstall-am:
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
+- check-am clean clean-generic clean-libtool clean-recursive \
+- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+- dist-shar dist-tarZ dist-zip distcheck distclean \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am am--refresh check check-am clean clean-generic \
++ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
++ dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-hdr distclean-libtool \
+- distclean-recursive distclean-tags distcleancheck distdir \
+- distuninstallcheck dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- installdirs-am maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-info-am
++ distclean-tags distcleancheck distdir distuninstallcheck dvi \
++ dvi-am html html-am info info-am install install-am \
++ install-data install-data-am install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs installdirs-am \
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am
+
+
+ distuninstallcheck:
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/missing seahorse-1.0.1/missing
+--- seahorse-1.0.1-old/missing 2007-03-17 21:34:31.000000000 +0100
++++ seahorse-1.0.1/missing 2007-05-01 22:57:35.000000000 +0200
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2005-06-08.21
++scriptversion=2006-05-10.23
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -106,7 +109,7 @@
+ # Now exit if we have it, but it failed. Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+ # the program).
+-case "$1" in
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -289,11 +290,17 @@
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+@@ -317,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/mkinstalldirs seahorse-1.0.1/mkinstalldirs
+--- seahorse-1.0.1-old/mkinstalldirs 2007-03-17 21:34:35.000000000 +0100
++++ seahorse-1.0.1/mkinstalldirs 2007-05-01 22:57:43.000000000 +0200
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/22x22/Makefile.in seahorse-1.0.1/pixmaps/22x22/Makefile.in
+--- seahorse-1.0.1-old/pixmaps/22x22/Makefile.in 2007-04-03 18:17:46.000000000 +0200
++++ seahorse-1.0.1/pixmaps/22x22/Makefile.in 2007-05-01 22:57:39.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -66,8 +62,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -98,8 +92,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -113,8 +105,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -130,23 +120,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -192,9 +167,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -209,8 +183,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -219,8 +191,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -235,48 +205,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -288,6 +227,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -315,8 +255,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ icon22dir = $(datadir)/pixmaps/seahorse/22x22/
+ icon22_DATA = seahorse.png \
+ seahorse-preferences.png \
+@@ -389,13 +332,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-desktop_iconsDATA: $(desktop_icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(desktop_iconsdir)" || $(mkdir_p) "$(DESTDIR)$(desktop_iconsdir)"
++ test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)"
+ @list='$(desktop_icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -412,7 +351,7 @@
+ done
+ install-icon22DATA: $(icon22_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(icon22dir)" || $(mkdir_p) "$(DESTDIR)$(icon22dir)"
++ test -z "$(icon22dir)" || $(MKDIR_P) "$(DESTDIR)$(icon22dir)"
+ @list='$(icon22_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -435,22 +374,21 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -466,7 +404,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(desktop_iconsdir)" "$(DESTDIR)$(icon22dir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -498,7 +436,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -512,12 +450,20 @@
+
+ install-data-am: install-desktop_iconsDATA install-icon22DATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -536,20 +482,22 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-desktop_iconsDATA uninstall-icon22DATA \
+- uninstall-info-am
++uninstall-am: uninstall-desktop_iconsDATA uninstall-icon22DATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-desktop_iconsDATA \
+- install-exec install-exec-am install-icon22DATA install-info \
+- install-info-am install-man install-strip installcheck \
++ install-dvi install-dvi-am install-exec install-exec-am \
++ install-html install-html-am install-icon22DATA install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+- uninstall-desktop_iconsDATA uninstall-icon22DATA \
+- uninstall-info-am
++ uninstall-desktop_iconsDATA uninstall-icon22DATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/48x48/Makefile.in seahorse-1.0.1/pixmaps/48x48/Makefile.in
+--- seahorse-1.0.1-old/pixmaps/48x48/Makefile.in 2007-04-03 18:17:46.000000000 +0200
++++ seahorse-1.0.1/pixmaps/48x48/Makefile.in 2007-05-01 22:57:39.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,8 +63,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -99,8 +93,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -114,8 +106,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -131,23 +121,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -193,9 +168,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -210,8 +184,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -220,8 +192,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -236,48 +206,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -289,6 +228,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -316,8 +256,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ icon48dir = $(datadir)/pixmaps/seahorse/48x48/
+ icon48_DATA = seahorse.png \
+ seahorse-preferences.png \
+@@ -385,13 +328,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-desktop_iconsDATA: $(desktop_icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(desktop_iconsdir)" || $(mkdir_p) "$(DESTDIR)$(desktop_iconsdir)"
++ test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)"
+ @list='$(desktop_icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -408,7 +347,7 @@
+ done
+ install-icon48DATA: $(icon48_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(icon48dir)" || $(mkdir_p) "$(DESTDIR)$(icon48dir)"
++ test -z "$(icon48dir)" || $(MKDIR_P) "$(DESTDIR)$(icon48dir)"
+ @list='$(icon48_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -425,7 +364,7 @@
+ done
+ install-pixmapDATA: $(pixmap_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
++ test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
+ @list='$(pixmap_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -448,22 +387,21 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -479,7 +417,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(desktop_iconsdir)" "$(DESTDIR)$(icon48dir)" "$(DESTDIR)$(pixmapdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -511,7 +449,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -526,12 +464,20 @@
+ install-data-am: install-desktop_iconsDATA install-icon48DATA \
+ install-pixmapDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -551,19 +497,23 @@
+ ps-am:
+
+ uninstall-am: uninstall-desktop_iconsDATA uninstall-icon48DATA \
+- uninstall-info-am uninstall-pixmapDATA
++ uninstall-pixmapDATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-desktop_iconsDATA \
+- install-exec install-exec-am install-icon48DATA install-info \
+- install-info-am install-man install-pixmapDATA install-strip \
++ install-dvi install-dvi-am install-exec install-exec-am \
++ install-html install-html-am install-icon48DATA install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-pixmapDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-desktop_iconsDATA uninstall-icon48DATA \
+- uninstall-info-am uninstall-pixmapDATA
++ uninstall-pixmapDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/Makefile.in seahorse-1.0.1/pixmaps/Makefile.in
+--- seahorse-1.0.1-old/pixmaps/Makefile.in 2007-04-03 18:17:46.000000000 +0200
++++ seahorse-1.0.1/pixmaps/Makefile.in 2007-05-01 22:57:40.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -51,10 +47,13 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -63,8 +62,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -95,8 +92,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -110,8 +105,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -127,23 +120,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -189,9 +167,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -206,8 +183,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -216,8 +191,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -232,48 +205,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -285,6 +227,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -312,8 +255,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = 22x22 48x48 scalable
+ gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+ all: all-recursive
+@@ -355,10 +301,6 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -390,8 +332,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -492,22 +433,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -521,7 +461,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -529,6 +469,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -568,8 +510,7 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+- distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -585,12 +526,20 @@
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -609,22 +558,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am
++uninstall-am:
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-data-am install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic clean-libtool \
++ ctags ctags-recursive distclean distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-hook install-exec install-exec-am \
+- install-info install-info-am install-man install-strip \
++ install-data-am install-data-hook install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+- tags tags-recursive uninstall uninstall-am uninstall-info-am
++ maintainer-clean maintainer-clean-generic mostlyclean \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am
+
+
+ install-data-hook:
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/pixmaps/scalable/Makefile.in seahorse-1.0.1/pixmaps/scalable/Makefile.in
+--- seahorse-1.0.1-old/pixmaps/scalable/Makefile.in 2007-04-03 18:17:46.000000000 +0200
++++ seahorse-1.0.1/pixmaps/scalable/Makefile.in 2007-05-01 22:57:40.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,8 +63,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -99,8 +93,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -114,8 +106,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -131,23 +121,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -193,9 +168,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -210,8 +184,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -220,8 +192,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -236,48 +206,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -289,6 +228,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -316,8 +256,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ pixmapdir = $(datadir)/pixmaps/
+ pixmap_DATA = seahorse-applet.svg
+ iconsvgdir = $(datadir)/pixmaps/seahorse/scalable/
+@@ -383,13 +326,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-desktop_iconsDATA: $(desktop_icons_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(desktop_iconsdir)" || $(mkdir_p) "$(DESTDIR)$(desktop_iconsdir)"
++ test -z "$(desktop_iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(desktop_iconsdir)"
+ @list='$(desktop_icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -406,7 +345,7 @@
+ done
+ install-iconsvgDATA: $(iconsvg_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(iconsvgdir)" || $(mkdir_p) "$(DESTDIR)$(iconsvgdir)"
++ test -z "$(iconsvgdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsvgdir)"
+ @list='$(iconsvg_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -423,7 +362,7 @@
+ done
+ install-pixmapDATA: $(pixmap_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(pixmapdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapdir)"
++ test -z "$(pixmapdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapdir)"
+ @list='$(pixmap_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -446,22 +385,21 @@
+
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -477,7 +415,7 @@
+ all-am: Makefile $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(desktop_iconsdir)" "$(DESTDIR)$(iconsvgdir)" "$(DESTDIR)$(pixmapdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -509,7 +447,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool
++distclean-am: clean-am distclean-generic
+
+ dvi: dvi-am
+
+@@ -524,12 +462,20 @@
+ install-data-am: install-desktop_iconsDATA install-iconsvgDATA \
+ install-pixmapDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -549,19 +495,23 @@
+ ps-am:
+
+ uninstall-am: uninstall-desktop_iconsDATA uninstall-iconsvgDATA \
+- uninstall-info-am uninstall-pixmapDATA
++ uninstall-pixmapDATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-desktop_iconsDATA \
+- install-exec install-exec-am install-iconsvgDATA install-info \
+- install-info-am install-man install-pixmapDATA install-strip \
++ install-dvi install-dvi-am install-exec install-exec-am \
++ install-html install-html-am install-iconsvgDATA install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-pixmapDATA install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic \
+ mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-desktop_iconsDATA uninstall-iconsvgDATA \
+- uninstall-info-am uninstall-pixmapDATA
++ uninstall-pixmapDATA
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/applet/docs/Makefile.in seahorse-1.0.1/plugins/applet/docs/Makefile.in
+--- seahorse-1.0.1-old/plugins/applet/docs/Makefile.in 2007-04-03 18:17:47.000000000 +0200
++++ seahorse-1.0.1/plugins/applet/docs/Makefile.in 2007-05-01 22:57:41.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -37,15 +37,11 @@
+ # the same distribution terms that you use for the rest of that program.
+
+ ################################################################################
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -79,8 +75,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -111,8 +105,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -126,8 +118,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -143,23 +133,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -205,9 +180,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -222,8 +196,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -232,8 +204,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -248,48 +218,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -301,6 +240,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -328,8 +268,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ _clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
+ _DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS))
+ _DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \
+@@ -476,10 +419,6 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ tags: TAGS
+ TAGS:
+
+@@ -488,23 +427,21 @@
+
+
+ distdir: $(DISTFILES)
+- $(mkdir_p) $(distdir)/../../..
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -552,8 +489,7 @@
+
+ distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+- distclean-local
++distclean-am: clean-am distclean-generic distclean-local
+
+ dvi: dvi-am
+
+@@ -567,12 +503,20 @@
+
+ install-data-am: install-data-local
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -593,19 +537,22 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-local
++uninstall-am: uninstall-local
++
++.MAKE: install-am install-strip
+
+ .PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ clean-local dist-hook distclean distclean-generic \
+ distclean-libtool distclean-local distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-data-local install-exec \
+- install-exec-am install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-local mostlyclean mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-local pdf pdf-am ps ps-am \
+- uninstall uninstall-am uninstall-info-am uninstall-local
++ install-data-am install-data-local install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic maintainer-clean-local mostlyclean \
++ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
++ pdf-am ps ps-am uninstall uninstall-am uninstall-local
+
+
+ DOC_H_FILE ?=
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/applet/Makefile.in seahorse-1.0.1/plugins/applet/Makefile.in
+--- seahorse-1.0.1-old/plugins/applet/Makefile.in 2007-04-03 18:17:47.000000000 +0200
++++ seahorse-1.0.1/plugins/applet/Makefile.in 2007-05-01 22:57:41.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -62,25 +58,27 @@
+ $(top_builddir)/libseahorse/libseahorse.a \
+ $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(seahorse_applet_SOURCES)
+ DIST_SOURCES = $(seahorse_applet_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+@@ -91,6 +89,8 @@
+ serverDATA_INSTALL = $(INSTALL_DATA)
+ uiDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(glade_DATA) $(server_DATA) $(ui_DATA)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -98,8 +98,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -130,8 +128,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -145,8 +141,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -162,23 +156,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -224,9 +203,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -241,8 +219,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -251,8 +227,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -267,48 +241,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -320,6 +263,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -347,8 +291,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ uidir = $(datadir)/gnome-2.0/ui
+ gladedir = $(datadir)/seahorse/glade/
+ SUBDIRS = docs
+@@ -432,7 +379,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-seahorse_appletPROGRAMS: $(seahorse_applet_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(seahorse_appletdir)" || $(mkdir_p) "$(DESTDIR)$(seahorse_appletdir)"
++ test -z "$(seahorse_appletdir)" || $(MKDIR_P) "$(DESTDIR)$(seahorse_appletdir)"
+ @list='$(seahorse_applet_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -460,7 +407,7 @@
+ done
+ seahorse-applet$(EXEEXT): $(seahorse_applet_OBJECTS) $(seahorse_applet_DEPENDENCIES)
+ @rm -f seahorse-applet$(EXEEXT)
+- $(LINK) $(seahorse_applet_LDFLAGS) $(seahorse_applet_OBJECTS) $(seahorse_applet_LDADD) $(LIBS)
++ $(LINK) $(seahorse_applet_OBJECTS) $(seahorse_applet_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -471,22 +418,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-applet.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -496,13 +443,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -519,7 +462,7 @@
+ done
+ install-serverDATA: $(server_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(serverdir)" || $(mkdir_p) "$(DESTDIR)$(serverdir)"
++ test -z "$(serverdir)" || $(MKDIR_P) "$(DESTDIR)$(serverdir)"
+ @list='$(server_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -536,7 +479,7 @@
+ done
+ install-uiDATA: $(ui_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(uidir)" || $(mkdir_p) "$(DESTDIR)$(uidir)"
++ test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)"
+ @list='$(ui_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -583,8 +526,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -685,22 +627,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -714,7 +655,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -722,6 +663,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -732,7 +675,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(seahorse_appletdir)" "$(DESTDIR)$(gladedir)" "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(uidir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -768,7 +711,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -783,12 +726,20 @@
+ install-data-am: install-gladeDATA install-seahorse_appletPROGRAMS \
+ install-serverDATA install-uiDATA
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -809,29 +760,29 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-gladeDATA uninstall-info-am \
+- uninstall-seahorse_appletPROGRAMS uninstall-serverDATA \
+- uninstall-uiDATA
++uninstall-am: uninstall-gladeDATA uninstall-seahorse_appletPROGRAMS \
++ uninstall-serverDATA uninstall-uiDATA
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic clean-libtool \
+ clean-seahorse_appletPROGRAMS ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-gladeDATA \
+- install-info install-info-am install-man \
+- install-seahorse_appletPROGRAMS install-serverDATA \
+- install-strip install-uiDATA installcheck installcheck-am \
+- installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-compile mostlyclean-generic \
+- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++ distclean-tags distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-gladeDATA \
++ install-html install-html-am install-info install-info-am \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-seahorse_appletPROGRAMS \
++ install-serverDATA install-strip install-uiDATA installcheck \
++ installcheck-am installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-gladeDATA \
+- uninstall-info-am uninstall-seahorse_appletPROGRAMS \
+- uninstall-serverDATA uninstall-uiDATA
++ uninstall-seahorse_appletPROGRAMS uninstall-serverDATA \
++ uninstall-uiDATA
+
+
+ $(server_in_files): $(server_in_files:.server.in=.server.in.in)
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/epiphany/Makefile.in seahorse-1.0.1/plugins/epiphany/Makefile.in
+--- seahorse-1.0.1-old/plugins/epiphany/Makefile.in 2007-04-03 18:17:48.000000000 +0200
++++ seahorse-1.0.1/plugins/epiphany/Makefile.in 2007-05-01 22:57:41.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -67,27 +63,35 @@
+ libseahorseextension_la-seahorse.lo
+ libseahorseextension_la_OBJECTS = \
+ $(am_libseahorseextension_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++libseahorseextension_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) \
++ $(libseahorseextension_la_CFLAGS) $(CFLAGS) \
++ $(libseahorseextension_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libseahorseextension_la_SOURCES)
+ DIST_SOURCES = $(libseahorseextension_la_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
+ extensioniniDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(extensionini_DATA)
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
+@@ -96,8 +100,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -128,8 +130,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -143,8 +143,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -160,23 +158,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -222,9 +205,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -239,8 +221,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -249,8 +229,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -265,48 +243,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -318,6 +265,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -345,8 +293,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ SUBDIRS = mozilla
+ extensiondir = $(libdir)/epiphany/$(E_API_VERSION)/extensions
+ extension_LTLIBRARIES = libseahorseextension.la
+@@ -421,7 +372,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-extensionLTLIBRARIES: $(extension_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(extensiondir)" || $(mkdir_p) "$(DESTDIR)$(extensiondir)"
++ test -z "$(extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(extensiondir)"
+ @list='$(extension_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+@@ -432,7 +383,7 @@
+
+ uninstall-extensionLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(extension_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(extension_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(extensiondir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(extensiondir)/$$p"; \
+@@ -447,7 +398,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libseahorseextension.la: $(libseahorseextension_la_OBJECTS) $(libseahorseextension_la_DEPENDENCIES)
+- $(LINK) -rpath $(extensiondir) $(libseahorseextension_la_LDFLAGS) $(libseahorseextension_la_OBJECTS) $(libseahorseextension_la_LIBADD) $(LIBS)
++ $(libseahorseextension_la_LINK) -rpath $(extensiondir) $(libseahorseextension_la_OBJECTS) $(libseahorseextension_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -459,52 +410,48 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libseahorseextension_la-seahorse.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+
+ libseahorseextension_la-seahorse-extension.lo: seahorse-extension.c
+- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse-extension.lo -MD -MP -MF "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo" -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo" "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Plo"; else rm -f "$(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse-extension.lo -MD -MP -MF $(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libseahorseextension_la-seahorse-extension.Tpo $(DEPDIR)/libseahorseextension_la-seahorse-extension.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='seahorse-extension.c' object='libseahorseextension_la-seahorse-extension.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse-extension.lo `test -f 'seahorse-extension.c' || echo '$(srcdir)/'`seahorse-extension.c
+
+ libseahorseextension_la-seahorse.lo: seahorse.c
+- at am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse.lo -MD -MP -MF "$(DEPDIR)/libseahorseextension_la-seahorse.Tpo" -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libseahorseextension_la-seahorse.Tpo" "$(DEPDIR)/libseahorseextension_la-seahorse.Plo"; else rm -f "$(DEPDIR)/libseahorseextension_la-seahorse.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -MT libseahorseextension_la-seahorse.lo -MD -MP -MF $(DEPDIR)/libseahorseextension_la-seahorse.Tpo -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libseahorseextension_la-seahorse.Tpo $(DEPDIR)/libseahorseextension_la-seahorse.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='seahorse.c' object='libseahorseextension_la-seahorse.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c
++ at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libseahorseextension_la_CPPFLAGS) $(CPPFLAGS) $(libseahorseextension_la_CFLAGS) $(CFLAGS) -c -o libseahorseextension_la-seahorse.lo `test -f 'seahorse.c' || echo '$(srcdir)/'`seahorse.c
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-extensioniniDATA: $(extensionini_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(extensioninidir)" || $(mkdir_p) "$(DESTDIR)$(extensioninidir)"
++ test -z "$(extensioninidir)" || $(MKDIR_P) "$(DESTDIR)$(extensioninidir)"
+ @list='$(extensionini_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -551,8 +498,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -653,22 +599,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -682,7 +627,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -690,6 +635,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -700,7 +647,7 @@
+ installdirs: installdirs-recursive
+ installdirs-am:
+ for dir in "$(DESTDIR)$(extensiondir)" "$(DESTDIR)$(extensioninidir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-recursive
+ install-exec: install-exec-recursive
+@@ -737,7 +684,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -751,12 +698,20 @@
+
+ install-data-am: install-extensionLTLIBRARIES install-extensioniniDATA
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -778,26 +733,27 @@
+ ps-am:
+
+ uninstall-am: uninstall-extensionLTLIBRARIES \
+- uninstall-extensioniniDATA uninstall-info-am
++ uninstall-extensioniniDATA
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-extensionLTLIBRARIES clean-generic clean-libtool \
+- clean-recursive ctags ctags-recursive distclean \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-extensionLTLIBRARIES \
++ clean-generic clean-libtool ctags ctags-recursive distclean \
+ distclean-compile distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
+- html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am \
++ distclean-tags distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am \
+ install-extensionLTLIBRARIES install-extensioniniDATA \
+- install-info install-info-am install-man install-strip \
+- installcheck installcheck-am installdirs installdirs-am \
+- maintainer-clean maintainer-clean-generic \
+- maintainer-clean-recursive mostlyclean mostlyclean-compile \
+- mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+- pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA \
+- uninstall-info-am
++ install-html install-html-am install-info install-info-am \
++ install-man install-pdf install-pdf-am install-ps \
++ install-ps-am install-strip installcheck installcheck-am \
++ installdirs installdirs-am maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags tags-recursive uninstall uninstall-am \
++ uninstall-extensionLTLIBRARIES uninstall-extensioniniDATA
+
+
+ %.ephy-extension.in: %.ephy-extension.in.in $(extension_LTLIBRARIES)
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/epiphany/mozilla/Makefile.in seahorse-1.0.1/plugins/epiphany/mozilla/Makefile.in
+--- seahorse-1.0.1-old/plugins/epiphany/mozilla/Makefile.in 2007-04-03 18:17:48.000000000 +0200
++++ seahorse-1.0.1/plugins/epiphany/mozilla/Makefile.in 2007-05-01 22:57:42.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -52,25 +48,31 @@
+ libsbmozilla_la_LIBADD =
+ am_libsbmozilla_la_OBJECTS = libsbmozilla_la-mozilla-helper.lo
+ libsbmozilla_la_OBJECTS = $(am_libsbmozilla_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++libsbmozilla_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
++ $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+-CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+- $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libsbmozilla_la_SOURCES)
+ DIST_SOURCES = $(libsbmozilla_la_SOURCES)
+ ETAGS = etags
+@@ -80,8 +82,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -112,8 +112,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -127,8 +125,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -144,23 +140,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -206,9 +187,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -223,8 +203,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -233,8 +211,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -249,48 +225,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -302,6 +247,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -329,8 +275,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ noinst_LTLIBRARIES = libsbmozilla.la
+ libsbmozilla_la_SOURCES = \
+ mozilla-helper.cpp \
+@@ -402,7 +351,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libsbmozilla.la: $(libsbmozilla_la_OBJECTS) $(libsbmozilla_la_DEPENDENCIES)
+- $(CXXLINK) $(libsbmozilla_la_LDFLAGS) $(libsbmozilla_la_OBJECTS) $(libsbmozilla_la_LIBADD) $(LIBS)
++ $(libsbmozilla_la_LINK) $(libsbmozilla_la_OBJECTS) $(libsbmozilla_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -413,32 +362,32 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libsbmozilla_la-mozilla-helper.Plo at am__quote@
+
+ .cpp.o:
+- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ $<
+
+ .cpp.obj:
+- at am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+ .cpp.lo:
+- at am__fastdepCXX_TRUE@ if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+
+ libsbmozilla_la-mozilla-helper.lo: mozilla-helper.cpp
+- at am__fastdepCXX_TRUE@ if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -MT libsbmozilla_la-mozilla-helper.lo -MD -MP -MF "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo" -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp; \
+- at am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo" "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Plo"; else rm -f "$(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo"; exit 1; fi
++ at am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -MT libsbmozilla_la-mozilla-helper.lo -MD -MP -MF $(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp
++ at am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsbmozilla_la-mozilla-helper.Tpo $(DEPDIR)/libsbmozilla_la-mozilla-helper.Plo
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='mozilla-helper.cpp' object='libsbmozilla_la-mozilla-helper.lo' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp
++ at am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsbmozilla_la_CPPFLAGS) $(CPPFLAGS) $(libsbmozilla_la_CXXFLAGS) $(CXXFLAGS) -c -o libsbmozilla_la-mozilla-helper.lo `test -f 'mozilla-helper.cpp' || echo '$(srcdir)/'`mozilla-helper.cpp
+
+ mostlyclean-libtool:
+ -rm -f *.lo
+@@ -446,10 +395,6 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -499,22 +444,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -562,7 +506,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -576,12 +520,20 @@
+
+ install-data-am:
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -602,19 +554,22 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am
++uninstall-am:
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-noinstLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am install-exec \
+- install-exec-am install-info install-info-am install-man \
++ install install-am install-data install-data-am install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
++ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-info-am
++ pdf pdf-am ps ps-am tags uninstall uninstall-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/gedit/Makefile.in seahorse-1.0.1/plugins/gedit/Makefile.in
+--- seahorse-1.0.1-old/plugins/gedit/Makefile.in 2007-04-03 18:17:48.000000000 +0200
++++ seahorse-1.0.1/plugins/gedit/Makefile.in 2007-05-01 22:57:42.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -69,17 +65,21 @@
+ @WITH_GEDIT_BONOBO_TRUE at am__objects_1 = seahorse-gedit-bonobo.lo
+ am_libseahorse_pgp_la_OBJECTS = seahorse-gedit.lo $(am__objects_1)
+ libseahorse_pgp_la_OBJECTS = $(am_libseahorse_pgp_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++libseahorse_pgp_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libseahorse_pgp_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libseahorse_pgp_la_SOURCES)
+ DIST_SOURCES = $(am__libseahorse_pgp_la_SOURCES_DIST)
+ pluginDATA_INSTALL = $(INSTALL_DATA)
+@@ -92,8 +92,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -124,8 +122,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -139,8 +135,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -156,23 +150,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -218,9 +197,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -235,8 +213,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -245,8 +221,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -261,48 +235,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -314,6 +257,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -341,8 +285,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+
+ # PLUGIN ----------------------------------------------------------------
+ plugindir = $(libdir)/gedit-2/plugins
+@@ -406,7 +353,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+@@ -417,7 +364,7 @@
+
+ uninstall-pluginLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(plugindir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(plugindir)/$$p"; \
+@@ -432,7 +379,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libseahorse-pgp.la: $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_DEPENDENCIES)
+- $(LINK) -rpath $(plugindir) $(libseahorse_pgp_la_LDFLAGS) $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_LIBADD) $(LIBS)
++ $(libseahorse_pgp_la_LINK) -rpath $(plugindir) $(libseahorse_pgp_la_OBJECTS) $(libseahorse_pgp_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -445,22 +392,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-gedit.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -470,13 +417,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-pluginDATA: $(plugin_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(plugindir)" || $(mkdir_p) "$(DESTDIR)$(plugindir)"
++ test -z "$(plugindir)" || $(MKDIR_P) "$(DESTDIR)$(plugindir)"
+ @list='$(plugin_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -493,7 +436,7 @@
+ done
+ install-schemasDATA: $(schemas_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(schemasdir)" || $(mkdir_p) "$(DESTDIR)$(schemasdir)"
++ test -z "$(schemasdir)" || $(MKDIR_P) "$(DESTDIR)$(schemasdir)"
+ @list='$(schemas_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -558,22 +501,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -589,7 +531,7 @@
+ all-am: Makefile $(LTLIBRARIES) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(plugindir)" "$(DESTDIR)$(schemasdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -625,7 +567,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -640,12 +582,20 @@
+ install-data-am: install-data-local install-pluginDATA \
+ install-pluginLTLIBRARIES install-schemasDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -666,23 +616,26 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am uninstall-pluginDATA \
+- uninstall-pluginLTLIBRARIES uninstall-schemasDATA
++uninstall-am: uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
++ uninstall-schemasDATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-pluginLTLIBRARIES ctags distclean \
+ distclean-compile distclean-generic distclean-libtool \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+- install-data-local install-exec install-exec-am install-info \
+- install-info-am install-man install-pluginDATA \
+- install-pluginLTLIBRARIES install-schemasDATA install-strip \
+- installcheck installcheck-am installdirs maintainer-clean \
++ install-data-local install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-pluginDATA install-pluginLTLIBRARIES install-ps \
++ install-ps-am install-schemasDATA install-strip installcheck \
++ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-info-am \
+- uninstall-pluginDATA uninstall-pluginLTLIBRARIES \
+- uninstall-schemasDATA
++ tags uninstall uninstall-am uninstall-pluginDATA \
++ uninstall-pluginLTLIBRARIES uninstall-schemasDATA
+
+ @INTLTOOL_SCHEMAS_RULE@
+
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/Makefile.in seahorse-1.0.1/plugins/Makefile.in
+--- seahorse-1.0.1-old/plugins/Makefile.in 2007-04-03 18:17:47.000000000 +0200
++++ seahorse-1.0.1/plugins/Makefile.in 2007-05-01 22:57:40.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -13,15 +13,11 @@
+ # PARTICULAR PURPOSE.
+
+ @SET_MAKE@
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -51,10 +47,13 @@
+ DIST_SOURCES =
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+- install-exec-recursive install-info-recursive \
+- install-recursive installcheck-recursive installdirs-recursive \
+- pdf-recursive ps-recursive uninstall-info-recursive \
+- uninstall-recursive
++ install-dvi-recursive install-exec-recursive \
++ install-html-recursive install-info-recursive \
++ install-pdf-recursive install-ps-recursive install-recursive \
++ installcheck-recursive installdirs-recursive pdf-recursive \
++ ps-recursive uninstall-recursive
++RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
++ distclean-recursive maintainer-clean-recursive
+ ETAGS = etags
+ CTAGS = ctags
+ DIST_SUBDIRS = nautilus applet epiphany gedit nautilus-ext
+@@ -63,8 +62,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -95,8 +92,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -110,8 +105,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -127,23 +120,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -189,9 +167,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -206,8 +183,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -216,8 +191,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -232,48 +205,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -285,6 +227,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -312,8 +255,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ @WITH_EPIPHANY_FALSE at EPIPHANY_DIR =
+ @WITH_EPIPHANY_TRUE at EPIPHANY_DIR = epiphany
+ @WITH_GEDIT_FALSE at GEDIT_DIR =
+@@ -362,10 +308,6 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+ # To change the values of `make' variables: instead of editing Makefiles,
+@@ -397,8 +339,7 @@
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+-mostlyclean-recursive clean-recursive distclean-recursive \
+-maintainer-clean-recursive:
++$(RECURSIVE_CLEAN_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+@@ -499,22 +440,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -528,7 +468,7 @@
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+- || $(mkdir_p) "$(distdir)/$$subdir" \
++ || $(MKDIR_P) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+@@ -536,6 +476,8 @@
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
++ am__remove_distdir=: \
++ am__skip_length_check=: \
+ distdir) \
+ || exit 1; \
+ fi; \
+@@ -575,8 +517,7 @@
+
+ distclean: distclean-recursive
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-libtool \
+- distclean-tags
++distclean-am: clean-am distclean-generic distclean-tags
+
+ dvi: dvi-recursive
+
+@@ -590,12 +531,20 @@
+
+ install-data-am:
+
++install-dvi: install-dvi-recursive
++
+ install-exec-am:
+
++install-html: install-html-recursive
++
+ install-info: install-info-recursive
+
+ install-man:
+
++install-pdf: install-pdf-recursive
++
++install-ps: install-ps-recursive
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-recursive
+@@ -614,22 +563,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am
++uninstall-am:
+
+-uninstall-info: uninstall-info-recursive
++.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
++ install-strip
+
+-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+- clean clean-generic clean-libtool clean-recursive ctags \
+- ctags-recursive distclean distclean-generic distclean-libtool \
+- distclean-recursive distclean-tags distdir dvi dvi-am html \
++.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
++ all all-am check check-am clean clean-generic clean-libtool \
++ ctags ctags-recursive distclean distclean-generic \
++ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
+- install-info-am install-man install-strip installcheck \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
++ install-info-am install-man install-pdf install-pdf-am \
++ install-ps install-ps-am install-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+- maintainer-clean-generic maintainer-clean-recursive \
+- mostlyclean mostlyclean-generic mostlyclean-libtool \
+- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+- uninstall uninstall-am uninstall-info-am
++ maintainer-clean-generic mostlyclean mostlyclean-generic \
++ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
++ uninstall uninstall-am
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/nautilus/Makefile.in seahorse-1.0.1/plugins/nautilus/Makefile.in
+--- seahorse-1.0.1-old/plugins/nautilus/Makefile.in 2007-04-03 18:17:49.000000000 +0200
++++ seahorse-1.0.1/plugins/nautilus/Makefile.in 2007-05-01 22:57:42.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -68,17 +64,18 @@
+ $(top_builddir)/libseahorse/libseahorse.a \
+ $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(seahorse_preferences_SOURCES) $(seahorse_tool_SOURCES)
+ DIST_SOURCES = $(seahorse_preferences_SOURCES) \
+ $(seahorse_tool_SOURCES)
+@@ -102,8 +99,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -134,8 +129,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -149,8 +142,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -166,23 +157,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -228,9 +204,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -245,8 +220,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -255,8 +228,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -271,48 +242,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -324,6 +264,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -351,8 +292,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ gladedir = $(datadir)/seahorse/glade/
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir) \
+@@ -436,7 +380,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -464,10 +408,10 @@
+ done
+ seahorse-preferences$(EXEEXT): $(seahorse_preferences_OBJECTS) $(seahorse_preferences_DEPENDENCIES)
+ @rm -f seahorse-preferences$(EXEEXT)
+- $(LINK) $(seahorse_preferences_LDFLAGS) $(seahorse_preferences_OBJECTS) $(seahorse_preferences_LDADD) $(LIBS)
++ $(LINK) $(seahorse_preferences_OBJECTS) $(seahorse_preferences_LDADD) $(LIBS)
+ seahorse-tool$(EXEEXT): $(seahorse_tool_OBJECTS) $(seahorse_tool_DEPENDENCIES)
+ @rm -f seahorse-tool$(EXEEXT)
+- $(LINK) $(seahorse_tool_LDFLAGS) $(seahorse_tool_OBJECTS) $(seahorse_tool_LDADD) $(LIBS)
++ $(LINK) $(seahorse_tool_OBJECTS) $(seahorse_tool_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -481,22 +425,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-tool.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -506,13 +450,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-man1: $(man1_MANS) $(man_MANS)
+ @$(NORMAL_INSTALL)
+- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
++ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
+ l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
+ for i in $$l2; do \
+@@ -557,7 +497,7 @@
+ done
+ install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
++ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -574,7 +514,7 @@
+ done
+ install-mimeDATA: $(mime_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(mimedir)" || $(mkdir_p) "$(DESTDIR)$(mimedir)"
++ test -z "$(mimedir)" || $(MKDIR_P) "$(DESTDIR)$(mimedir)"
+ @list='$(mime_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -591,7 +531,7 @@
+ done
+ install-olddesktopDATA: $(olddesktop_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(olddesktopdir)" || $(mkdir_p) "$(DESTDIR)$(olddesktopdir)"
++ test -z "$(olddesktopdir)" || $(MKDIR_P) "$(DESTDIR)$(olddesktopdir)"
+ @list='$(olddesktop_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -656,22 +596,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -687,7 +626,7 @@
+ all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)" "$(DESTDIR)$(olddesktopdir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -722,7 +661,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -737,12 +676,20 @@
+ install-data-am: install-data-local install-desktopDATA install-man \
+ install-mimeDATA install-olddesktopDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man: install-man1
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -764,26 +711,30 @@
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
+- uninstall-info-am uninstall-local uninstall-man \
+- uninstall-mimeDATA uninstall-olddesktopDATA
++ uninstall-local uninstall-man uninstall-mimeDATA \
++ uninstall-olddesktopDATA
+
+ uninstall-man: uninstall-man1
+
++.MAKE: install-am install-strip
++
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am \
+- install-data-local install-desktopDATA install-exec \
+- install-exec-am install-info install-info-am install-man \
++ install-data-local install-desktopDATA install-dvi \
++ install-dvi-am install-exec install-exec-am install-html \
++ install-html-am install-info install-info-am install-man \
+ install-man1 install-mimeDATA install-olddesktopDATA \
++ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-desktopDATA uninstall-info-am \
+- uninstall-local uninstall-man uninstall-man1 \
+- uninstall-mimeDATA uninstall-olddesktopDATA
++ uninstall-binPROGRAMS uninstall-desktopDATA uninstall-local \
++ uninstall-man uninstall-man1 uninstall-mimeDATA \
++ uninstall-olddesktopDATA
+
+
+ @UPDATE_MIME_DATABASE_TRUE at install-data-local:
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/plugins/nautilus-ext/Makefile.in seahorse-1.0.1/plugins/nautilus-ext/Makefile.in
+--- seahorse-1.0.1-old/plugins/nautilus-ext/Makefile.in 2007-04-03 18:17:48.000000000 +0200
++++ seahorse-1.0.1/plugins/nautilus-ext/Makefile.in 2007-05-01 22:57:42.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -14,15 +14,11 @@
+
+ @SET_MAKE@
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ../..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -63,17 +59,21 @@
+ seahorse-nautilus-module.lo
+ libnautilus_seahorse_la_OBJECTS = \
+ $(am_libnautilus_seahorse_la_OBJECTS)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++libnautilus_seahorse_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
++ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++ $(libnautilus_seahorse_la_LDFLAGS) $(LDFLAGS) -o $@
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(libnautilus_seahorse_la_SOURCES)
+ DIST_SOURCES = $(libnautilus_seahorse_la_SOURCES)
+ ETAGS = etags
+@@ -83,8 +83,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -115,8 +113,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -130,8 +126,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -147,23 +141,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -209,9 +188,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -226,8 +204,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -236,8 +212,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -252,48 +226,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -305,6 +248,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -332,8 +276,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ INCLUDES = -I$(top_builddir) \
+ -I$(top_srcdir) \
+ $(NAUTILUS_CFLAGS) \
+@@ -385,7 +332,7 @@
+ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-nautilus_extensionLTLIBRARIES: $(nautilus_extension_LTLIBRARIES)
+ @$(NORMAL_INSTALL)
+- test -z "$(nautilus_extensiondir)" || $(mkdir_p) "$(DESTDIR)$(nautilus_extensiondir)"
++ test -z "$(nautilus_extensiondir)" || $(MKDIR_P) "$(DESTDIR)$(nautilus_extensiondir)"
+ @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
+ if test -f $$p; then \
+ f=$(am__strip_dir) \
+@@ -396,7 +343,7 @@
+
+ uninstall-nautilus_extensionLTLIBRARIES:
+ @$(NORMAL_UNINSTALL)
+- @set -x; list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
++ @list='$(nautilus_extension_LTLIBRARIES)'; for p in $$list; do \
+ p=$(am__strip_dir) \
+ echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(nautilus_extensiondir)/$$p'"; \
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(nautilus_extensiondir)/$$p"; \
+@@ -411,7 +358,7 @@
+ rm -f "$${dir}/so_locations"; \
+ done
+ libnautilus-seahorse.la: $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_DEPENDENCIES)
+- $(LINK) -rpath $(nautilus_extensiondir) $(libnautilus_seahorse_la_LDFLAGS) $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_LIBADD) $(LIBS)
++ $(libnautilus_seahorse_la_LINK) -rpath $(nautilus_extensiondir) $(libnautilus_seahorse_la_OBJECTS) $(libnautilus_seahorse_la_LIBADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -423,22 +370,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-nautilus.Plo at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -449,10 +396,6 @@
+ clean-libtool:
+ -rm -rf .libs _libs
+
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+-
+ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+@@ -502,22 +445,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -533,7 +475,7 @@
+ all-am: Makefile $(LTLIBRARIES)
+ installdirs:
+ for dir in "$(DESTDIR)$(nautilus_extensiondir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -568,7 +510,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -582,12 +524,20 @@
+
+ install-data-am: install-nautilus_extensionLTLIBRARIES
+
++install-dvi: install-dvi-am
++
+ install-exec-am:
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -608,21 +558,24 @@
+
+ ps-am:
+
+-uninstall-am: uninstall-info-am \
+- uninstall-nautilus_extensionLTLIBRARIES
++uninstall-am: uninstall-nautilus_extensionLTLIBRARIES
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
+ clean-libtool clean-nautilus_extensionLTLIBRARIES ctags \
+ distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+- install-data-am install-exec install-exec-am install-info \
++ install-data-am install-dvi install-dvi-am install-exec \
++ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man \
+- install-nautilus_extensionLTLIBRARIES install-strip \
++ install-nautilus_extensionLTLIBRARIES install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+- tags uninstall uninstall-am uninstall-info-am \
++ tags uninstall uninstall-am \
+ uninstall-nautilus_extensionLTLIBRARIES
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+diff -x'*INSTALL*' -Naur seahorse-1.0.1-old/src/Makefile.in seahorse-1.0.1/src/Makefile.in
+--- seahorse-1.0.1-old/src/Makefile.in 2007-04-03 18:17:49.000000000 +0200
++++ seahorse-1.0.1/src/Makefile.in 2007-05-01 22:57:43.000000000 +0200
+@@ -1,8 +1,8 @@
+-# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# Makefile.in generated by automake 1.10 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+-# 2003, 2004, 2005 Free Software Foundation, Inc.
++# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -15,15 +15,11 @@
+ @SET_MAKE@
+
+
+-srcdir = @srcdir@
+-top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-top_builddir = ..
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+-INSTALL = @INSTALL@
+ install_sh_DATA = $(install_sh) -c -m 644
+ install_sh_PROGRAM = $(install_sh) -c
+ install_sh_SCRIPT = $(install_sh) -c
+@@ -104,17 +100,18 @@
+ am__DEPENDENCIES_1 =
+ seahorse_DEPENDENCIES = $(top_builddir)/libseahorse/libseahorse.a \
+ $(top_builddir)/libcryptui/libcryptui.la $(am__DEPENDENCIES_1)
+-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
++DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+- $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+- $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+- $(AM_LDFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
++ $(LDFLAGS) -o $@
+ SOURCES = $(seahorse_SOURCES)
+ DIST_SOURCES = $(am__seahorse_SOURCES_DIST)
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -133,8 +130,6 @@
+ AGENT_CFLAGS = @AGENT_CFLAGS@
+ AGENT_LIBS = @AGENT_LIBS@
+ ALL_LINGUAS = @ALL_LINGUAS@
+-AMDEP_FALSE = @AMDEP_FALSE@
+-AMDEP_TRUE = @AMDEP_TRUE@
+ AMTAR = @AMTAR@
+ AR = @AR@
+ AUTOCONF = @AUTOCONF@
+@@ -165,8 +160,6 @@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+-ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+-ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+ EPIPHANY_DEPENDENCY_CFLAGS = @EPIPHANY_DEPENDENCY_CFLAGS@
+ EPIPHANY_DEPENDENCY_LIBS = @EPIPHANY_DEPENDENCY_LIBS@
+ EPIPHANY_EXTENSIONS_DIR = @EPIPHANY_EXTENSIONS_DIR@
+@@ -180,8 +173,6 @@
+ E_API_VERSION = @E_API_VERSION@
+ F77 = @F77@
+ FFLAGS = @FFLAGS@
+-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
+-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
+ GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
+ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
+ GEDIT_CFLAGS = @GEDIT_CFLAGS@
+@@ -197,23 +188,8 @@
+ GNUPG = @GNUPG@
+ GPGME_CONFIG = @GPGME_CONFIG@
+ GREP = @GREP@
+-HAVE_GECKO_1_7_FALSE = @HAVE_GECKO_1_7_FALSE@
+-HAVE_GECKO_1_7_TRUE = @HAVE_GECKO_1_7_TRUE@
+-HAVE_GECKO_1_8_1_FALSE = @HAVE_GECKO_1_8_1_FALSE@
+-HAVE_GECKO_1_8_1_TRUE = @HAVE_GECKO_1_8_1_TRUE@
+-HAVE_GECKO_1_8_FALSE = @HAVE_GECKO_1_8_FALSE@
+-HAVE_GECKO_1_8_TRUE = @HAVE_GECKO_1_8_TRUE@
+-HAVE_GECKO_1_9_FALSE = @HAVE_GECKO_1_9_FALSE@
+-HAVE_GECKO_1_9_TRUE = @HAVE_GECKO_1_9_TRUE@
+-HAVE_GECKO_DEBUG_FALSE = @HAVE_GECKO_DEBUG_FALSE@
+-HAVE_GECKO_DEBUG_TRUE = @HAVE_GECKO_DEBUG_TRUE@
+-HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+-HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+-HAVE_MOZILLA_TOOLKIT_FALSE = @HAVE_MOZILLA_TOOLKIT_FALSE@
+-HAVE_MOZILLA_TOOLKIT_TRUE = @HAVE_MOZILLA_TOOLKIT_TRUE@
+-HAVE_USER_MLOCK_FALSE = @HAVE_USER_MLOCK_FALSE@
+-HAVE_USER_MLOCK_TRUE = @HAVE_USER_MLOCK_TRUE@
+ HELP_DIR = @HELP_DIR@
++INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+@@ -259,9 +235,8 @@
+ LN_S = @LN_S@
+ LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
+-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
++MKDIR_P = @MKDIR_P@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+ MOZILLA = @MOZILLA@
+ MOZILLA_COMPONENT_CFLAGS = @MOZILLA_COMPONENT_CFLAGS@
+@@ -276,8 +251,6 @@
+ NAUTILUS_LIBS = @NAUTILUS_LIBS@
+ OBJEXT = @OBJEXT@
+ OMF_DIR = @OMF_DIR@
+-OS_WIN32_FALSE = @OS_WIN32_FALSE@
+-OS_WIN32_TRUE = @OS_WIN32_TRUE@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+@@ -286,8 +259,6 @@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+-PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@
+-PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@
+ PLUGIN_LIBTOOL_FLAGS = @PLUGIN_LIBTOOL_FLAGS@
+ POFILES = @POFILES@
+ POSUB = @POSUB@
+@@ -302,48 +273,17 @@
+ SHELL = @SHELL@
+ SOUP_CFLAGS = @SOUP_CFLAGS@
+ SOUP_LIBS = @SOUP_LIBS@
+-SSH_ADD_PATH = @SSH_ADD_PATH@
+-SSH_KEYGEN_PATH = @SSH_KEYGEN_PATH@
+-SSH_PATH = @SSH_PATH@
+ STRIP = @STRIP@
+-UPDATE_MIME_DATABASE_FALSE = @UPDATE_MIME_DATABASE_FALSE@
+-UPDATE_MIME_DATABASE_TRUE = @UPDATE_MIME_DATABASE_TRUE@
+ USE_NLS = @USE_NLS@
+ VERSION = @VERSION@
+-WITH_AGENT_FALSE = @WITH_AGENT_FALSE@
+-WITH_AGENT_TRUE = @WITH_AGENT_TRUE@
+-WITH_APPLET_FALSE = @WITH_APPLET_FALSE@
+-WITH_APPLET_TRUE = @WITH_APPLET_TRUE@
+-WITH_EPIPHANY_FALSE = @WITH_EPIPHANY_FALSE@
+-WITH_EPIPHANY_TRUE = @WITH_EPIPHANY_TRUE@
+-WITH_GEDIT_BONOBO_FALSE = @WITH_GEDIT_BONOBO_FALSE@
+-WITH_GEDIT_BONOBO_TRUE = @WITH_GEDIT_BONOBO_TRUE@
+-WITH_GEDIT_FALSE = @WITH_GEDIT_FALSE@
+-WITH_GEDIT_TRUE = @WITH_GEDIT_TRUE@
+-WITH_GNOME_KEYRING_FALSE = @WITH_GNOME_KEYRING_FALSE@
+-WITH_GNOME_KEYRING_TRUE = @WITH_GNOME_KEYRING_TRUE@
+-WITH_HKP_FALSE = @WITH_HKP_FALSE@
+-WITH_HKP_TRUE = @WITH_HKP_TRUE@
+-WITH_KEYSERVER_FALSE = @WITH_KEYSERVER_FALSE@
+-WITH_KEYSERVER_TRUE = @WITH_KEYSERVER_TRUE@
+-WITH_LDAP_FALSE = @WITH_LDAP_FALSE@
+-WITH_LDAP_TRUE = @WITH_LDAP_TRUE@
+-WITH_NAUTILUS_EXT_FALSE = @WITH_NAUTILUS_EXT_FALSE@
+-WITH_NAUTILUS_EXT_TRUE = @WITH_NAUTILUS_EXT_TRUE@
+-WITH_SHARING_FALSE = @WITH_SHARING_FALSE@
+-WITH_SHARING_TRUE = @WITH_SHARING_TRUE@
+-WITH_SSH_FALSE = @WITH_SSH_FALSE@
+-WITH_SSH_TRUE = @WITH_SSH_TRUE@
+-WITH_TESTS_FALSE = @WITH_TESTS_FALSE@
+-WITH_TESTS_TRUE = @WITH_TESTS_TRUE@
+ XGETTEXT = @XGETTEXT@
++abs_builddir = @abs_builddir@
++abs_srcdir = @abs_srcdir@
++abs_top_builddir = @abs_top_builddir@
++abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_CXX = @ac_ct_CXX@
+ ac_ct_F77 = @ac_ct_F77@
+-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -355,6 +295,7 @@
+ build_cpu = @build_cpu@
+ build_os = @build_os@
+ build_vendor = @build_vendor@
++builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+ docdir = @docdir@
+@@ -382,8 +323,11 @@
+ psdir = @psdir@
+ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
++srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
++top_builddir = @top_builddir@
++top_srcdir = @top_srcdir@
+ gladedir = $(datadir)/seahorse/glade/
+ pixmapsdir = $(datadir)/pixmaps/
+ INCLUDES = -I$(top_builddir) \
+@@ -522,7 +466,7 @@
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ @$(NORMAL_INSTALL)
+- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
++ test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+ @list='$(bin_PROGRAMS)'; for p in $$list; do \
+ p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+ if test -f $$p \
+@@ -550,7 +494,7 @@
+ done
+ seahorse$(EXEEXT): $(seahorse_OBJECTS) $(seahorse_DEPENDENCIES)
+ @rm -f seahorse$(EXEEXT)
+- $(LINK) $(seahorse_LDFLAGS) $(seahorse_OBJECTS) $(seahorse_LDADD) $(LIBS)
++ $(LINK) $(seahorse_OBJECTS) $(seahorse_LDADD) $(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
+@@ -586,22 +530,22 @@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/seahorse-ssh-upload.Po at am__quote@
+
+ .c.o:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c $<
+
+ .c.obj:
+- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+ .c.lo:
+- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
+- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
++ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+@@ -611,13 +555,9 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-distclean-libtool:
+- -rm -f libtool
+-uninstall-info-am:
+ install-desktopDATA: $(desktop_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(desktopdir)" || $(mkdir_p) "$(DESTDIR)$(desktopdir)"
++ test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
+ @list='$(desktop_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -634,7 +574,7 @@
+ done
+ install-gladeDATA: $(glade_DATA)
+ @$(NORMAL_INSTALL)
+- test -z "$(gladedir)" || $(mkdir_p) "$(DESTDIR)$(gladedir)"
++ test -z "$(gladedir)" || $(MKDIR_P) "$(DESTDIR)$(gladedir)"
+ @list='$(glade_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+@@ -699,22 +639,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+- list='$(DISTFILES)'; for file in $$list; do \
+- case $$file in \
+- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+- esac; \
++ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
++ list='$(DISTFILES)'; \
++ dist_files=`for file in $$list; do echo $$file; done | \
++ sed -e "s|^$$srcdirstrip/||;t" \
++ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
++ case $$dist_files in \
++ */*) $(MKDIR_P) `echo "$$dist_files" | \
++ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
++ sort -u` ;; \
++ esac; \
++ for file in $$dist_files; do \
+ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+- dir="/$$dir"; \
+- $(mkdir_p) "$(distdir)$$dir"; \
+- else \
+- dir=''; \
+- fi; \
+ if test -d $$d/$$file; then \
++ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+ fi; \
+@@ -730,7 +669,7 @@
+ all-am: Makefile $(PROGRAMS) $(DATA)
+ installdirs:
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(gladedir)"; do \
+- test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ done
+ install: install-am
+ install-exec: install-exec-am
+@@ -765,7 +704,7 @@
+ -rm -rf ./$(DEPDIR)
+ -rm -f Makefile
+ distclean-am: clean-am distclean-compile distclean-generic \
+- distclean-libtool distclean-tags
++ distclean-tags
+
+ dvi: dvi-am
+
+@@ -779,12 +718,20 @@
+
+ install-data-am: install-desktopDATA install-gladeDATA
+
++install-dvi: install-dvi-am
++
+ install-exec-am: install-binPROGRAMS
+
++install-html: install-html-am
++
+ install-info: install-info-am
+
+ install-man:
+
++install-pdf: install-pdf-am
++
++install-ps: install-ps-am
++
+ installcheck-am:
+
+ maintainer-clean: maintainer-clean-am
+@@ -806,21 +753,24 @@
+ ps-am:
+
+ uninstall-am: uninstall-binPROGRAMS uninstall-desktopDATA \
+- uninstall-gladeDATA uninstall-info-am
++ uninstall-gladeDATA
++
++.MAKE: install-am install-strip
+
+ .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
+ clean-generic clean-libtool ctags distclean distclean-compile \
+ distclean-generic distclean-libtool distclean-tags distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-binPROGRAMS install-data install-data-am \
+- install-desktopDATA install-exec install-exec-am \
+- install-gladeDATA install-info install-info-am install-man \
+- install-strip installcheck installcheck-am installdirs \
+- maintainer-clean maintainer-clean-generic mostlyclean \
+- mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+- pdf pdf-am ps ps-am tags uninstall uninstall-am \
+- uninstall-binPROGRAMS uninstall-desktopDATA \
+- uninstall-gladeDATA uninstall-info-am
++ install-desktopDATA install-dvi install-dvi-am install-exec \
++ install-exec-am install-gladeDATA install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
++ maintainer-clean-generic mostlyclean mostlyclean-compile \
++ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++ tags uninstall uninstall-am uninstall-binPROGRAMS \
++ uninstall-desktopDATA uninstall-gladeDATA
+
+ @INTLTOOL_DESKTOP_RULE@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
Propchange: desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch Tue May 1 21:33:05 2007
@@ -1,0 +1,45 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_seahorse-agent-man.dpatch by <persia at localhost.localdomain>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes the name of the command in the seahorse-agent manpage
+
+ at DPATCH@
+diff -urNad seahorse-0.9.10~/agent/seahorse-agent.1 seahorse-0.9.10/agent/seahorse-agent.1
+--- seahorse-0.9.10~/agent/seahorse-agent.1 2006-12-11 01:21:32.000000000 +0900
++++ seahorse-0.9.10/agent/seahorse-agent.1 2007-01-10 09:43:23.284803842 +0900
+@@ -3,13 +3,13 @@
+ .\" ``makeman.pl'' is part of the ``MakeMan'' project.
+ .\" For more information, please see http://mama.sourceforge.net
+ .\"
+-.TH seahorse\-daemon 1 "May 04, 2006" "seahorse" "GNOME"
++.TH seahorse\-agent 1 "May 04, 2006" "seahorse" "GNOME"
+
+ .SH NAME
+-seahorse\-daemon \- seahorse pass phrase caching agent
++seahorse\-agent \- seahorse pass phrase caching agent
+
+ .SH SYNOPSIS
+-\fBseahorse\-daemon\fR
++\fBseahorse\-agent\fR
+ [ \fIOPTION\fR... ]
+
+ .SH "DESCRIPTION"
+@@ -39,7 +39,7 @@
+ Print variables in for a C type shell.
+ .TP
+ \fB\-d, \-\-no\-daemonize\fR
+-Do not daemonize seahorse\-daemon.
++Do not daemonize seahorse\-agent.
+ .TP
+ \fB\-A, \-\-any\-display\fR
+ Don't try to make sure requests only come from the X display on which seahorse\-agent was started.
+@@ -54,7 +54,7 @@
+
+ .SH "VERSION"
+ .PP
+-This man page describes \fBseahorse\-daemon\fR version 0.9.
++This man page describes \fBseahorse\-agent\fR version 0.9.
+
+ .SH "BUGS"
+ .PP
Propchange: desktop/unstable/seahorse/debian/patches/1_seahorse-agent-manpage.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/patches/2_mlock.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/2_mlock.dpatch?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/2_mlock.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/2_mlock.dpatch Tue May 1 21:33:05 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- seahorse-1.0.1/acinclude.m4.old 2007-05-01 22:50:34.000000000 +0200
++++ seahorse-1.0.1/acinclude.m4 2007-05-01 22:52:38.000000000 +0200
+@@ -53,6 +53,7 @@
+ #include <sys/mman.h>
+ #include <sys/types.h>
+ #include <fcntl.h>
++ #include <stdio.h>
+
+ int main () {
+ long int pgsize = getpagesize ();
+@@ -66,10 +67,11 @@
+ return 2;
+ }
+ /* Configure is being run as root? */
+- if (geteuid () == 0) {
++ /* breaks with fakeroot */
++ /* if (geteuid () == 0) {
+ printf("assuming ");
+ return 1;
+- }
++ } */
+ return 0;
+ }
+ ],
Propchange: desktop/unstable/seahorse/debian/patches/2_mlock.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/patches/3_setuid.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/3_setuid.dpatch?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/3_setuid.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/3_setuid.dpatch Tue May 1 21:33:05 2007
@@ -1,0 +1,13 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+ at DPATCH@
+
+--- seahorse-1.0.1/agent/Makefile.am.old 2007-05-01 22:55:27.000000000 +0200
++++ seahorse-1.0.1/agent/Makefile.am 2007-05-01 22:55:30.000000000 +0200
+@@ -49,5 +49,5 @@
+ else
+ # Make the daemon setuid
+ install-exec-hook:
+- chmod u+s $(DESTDIR)$(bindir)/seahorse-daemon
++ chmod u+s $(DESTDIR)$(bindir)/seahorse-agent
+ endif
Propchange: desktop/unstable/seahorse/debian/patches/3_setuid.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch Tue May 1 21:33:05 2007
@@ -1,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## force_ssh.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Force ssh support without requiring it as a Build Dependency only
+## DP: for checking that ssh-keygen does exist
+
+ at DPATCH@
+diff -urNad seahorse-0.9.3.obsolete.0.486755549050034~/configure.in seahorse-0.9.3.obsolete.0.486755549050034/configure.in
+--- seahorse-0.9.3.obsolete.0.486755549050034~/configure.in 2006-08-24 22:13:04.000000000 +0200
++++ seahorse-0.9.3.obsolete.0.486755549050034/configure.in 2006-08-27 23:58:27.000000000 +0200
+@@ -592,19 +592,19 @@
+ echo "disabling ssh support"
+ else
+
+- AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
+- AC_PATH_PROG(SSH_ADD_PATH, ssh-add, "failed")
+- AC_PATH_PROG(SSH_PATH, ssh, "failed")
++# AC_PATH_PROG(SSH_KEYGEN_PATH, ssh-keygen, "failed")
++# AC_PATH_PROG(SSH_ADD_PATH, ssh-add, "failed")
++# AC_PATH_PROG(SSH_PATH, ssh, "failed")
+
+- if test $SSH_KEYGEN_PATH != "failed" &&
+- test $SSH_PATH != "failed" &&
+- test $SSH_ADD_PATH != "failed"; then
++# if test $SSH_KEYGEN_PATH != "failed" &&
++# test $SSH_PATH != "failed" &&
++# test $SSH_ADD_PATH != "failed"; then
+ enable_ssh="yes"
+ AC_DEFINE(WITH_SSH, 1, [With SSH Support])
+- AC_DEFINE_UNQUOTED(SSH_KEYGEN_PATH, "$SSH_KEYGEN_PATH", [Path to ssh-keygen])
+- AC_DEFINE_UNQUOTED(SSH_PATH, "$SSH_PATH", [Path to ssh])
+- AC_DEFINE_UNQUOTED(SSH_ADD_PATH, "$SSH_ADD_PATH", [Path to ssh-add])
+- fi
++ AC_DEFINE_UNQUOTED(SSH_KEYGEN_PATH, "/usr/bin/ssh-keygen", [Path to ssh-keygen])
++ AC_DEFINE_UNQUOTED(SSH_PATH, "/usr/bin/ssh", [Path to ssh])
++ AC_DEFINE_UNQUOTED(SSH_ADD_PATH, "/usr/bin/ssh-add", [Path to ssh-add])
++# fi
+
+ fi
+
Propchange: desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/patches/multiple_messages.dpatch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/multiple_messages.dpatch?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/multiple_messages.dpatch (added)
+++ desktop/unstable/seahorse/debian/patches/multiple_messages.dpatch Tue May 1 21:33:05 2007
@@ -1,0 +1,71 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## multiple_messages.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gpgme1.0-1.1.2~/gpgme/verify.c gpgme1.0-1.1.2/gpgme/verify.c
+--- gpgme1.0-1.1.2~/gpgme/verify.c 2006-02-09 20:56:31.000000000 +0100
++++ gpgme1.0-1.1.2/gpgme/verify.c 2007-03-07 23:44:27.000000000 +0100
+@@ -40,6 +40,7 @@
+ gpgme_signature_t current_sig;
+ int did_prepare_new_sig;
+ int only_newsig_seen;
++ int plaintext_seen;
+ } *op_data_t;
+
+
+@@ -549,8 +550,11 @@
+ }
+
+
++/* Parse an error status line and if SET_STATUS is true update the
++ result status as appropriate. With SET_STATUS being false, only
++ check for an error. */
+ static gpgme_error_t
+-parse_error (gpgme_signature_t sig, char *args)
++parse_error (gpgme_signature_t sig, char *args, int set_status)
+ {
+ gpgme_error_t err;
+ char *where = strchr (args, ' ');
+@@ -572,7 +576,16 @@
+
+ err = _gpgme_map_gnupg_error (which);
+
+- if (!strcmp (where, "verify.findkey"))
++ if (!strcmp (where, "proc_pkt.plaintext")
++ && gpg_err_code (err) == GPG_ERR_BAD_DATA)
++ {
++ /* This indicates a double plaintext. The only solid way to
++ handle this is by failing the oepration. */
++ return gpg_error (GPG_ERR_BAD_DATA);
++ }
++ else if (!set_status)
++ ;
++ else if (!strcmp (where, "verify.findkey"))
+ sig->status = err;
+ else if (!strcmp (where, "verify.keyusage")
+ && gpg_err_code (err) == GPG_ERR_WRONG_KEY_USAGE)
+@@ -670,9 +683,9 @@
+
+ case GPGME_STATUS_ERROR:
+ opd->only_newsig_seen = 0;
+- /* The error status is informational, so we don't return an
+- error code if we are not ready to process this status. */
+- return sig ? parse_error (sig, args) : 0;
++ /* Some error stati are informational, so we don't return an
++ error code if we are not ready to process this status. */
++ return parse_error (sig, args, !!sig );
+
+ case GPGME_STATUS_EOF:
+ if (sig && !opd->did_prepare_new_sig)
+@@ -703,6 +716,8 @@
+ break;
+
+ case GPGME_STATUS_PLAINTEXT:
++ if (++opd->plaintext_seen > 1)
++ return gpg_error (GPG_ERR_BAD_DATA);
+ err = _gpgme_parse_plaintext (args, &opd->result.file_name);
+ if (err)
+ return err;
Propchange: desktop/unstable/seahorse/debian/patches/multiple_messages.dpatch
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/rules?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/rules (added)
+++ desktop/unstable/seahorse/debian/rules Tue May 1 21:33:05 2007
@@ -1,0 +1,142 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+# Modified for Seahorse
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# C compiler information
+CC = gcc
+CFLAGS = -Wall -g
+LDFLAGS = -Wl,-O1
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+
+include /usr/share/dpatch/dpatch.make
+
+# The autotools target is used to get the latest version of config.[guess,sub]
+# files. This should avoid autobuild errors, but adds a Build-Dependency
+# in autotools-dev
+autotools:
+ -if [ -f config.sub.old ]; then \
+ rm -f config.sub; \
+ else \
+ mv config.sub config.sub.old; \
+ fi
+ -if [ -f config.guess.old ]; then \
+ rm -f config.guess; \
+ else \
+ mv config.guess config.guess.old; \
+ fi
+ ln -s /usr/share/misc/config.sub config.sub
+ ln -s /usr/share/misc/config.guess config.guess
+
+ touch autotools
+
+configure: patch-stamp configure-stamp
+configure-stamp: autotools
+ dh_testdir
+
+ CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ ./configure $(confflags) --prefix=/usr --sysconfdir=/etc \
+ --disable-update-mime-database --disable-schemas-install \
+ --disable-scrollkeeper
+
+ touch configure-stamp
+
+build: build-stamp
+build-stamp: configure
+ dh_testdir
+
+ $(MAKE)
+
+ touch build-stamp
+
+clean: unpatch
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+ rm -f configure-stamp
+ rm -f autotools
+
+ -$(MAKE) distclean
+
+ -rm -f config.log
+ -rm -rf debian/seahorse
+
+ -if [ -f config.sub.old ]; then \
+ mv config.sub.old config.sub; \
+ fi
+ -if [ -f config.guess.old ]; then \
+ mv config.guess.old config.guess; \
+ fi
+
+ -rm -rf debian/patched
+
+ dh_clean
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/seahorse
+
+ mkdir -p $(CURDIR)/debian/seahorse/etc/X11/Xsession.d
+ cp debian/seahorse.Xsession $(CURDIR)/debian/seahorse/etc/X11/Xsession.d/60seahorse
+
+ # Remove mime-type catalog, it's in shared-mime-info since 0.20
+ rm -f debian/seahorse/usr/share/mime/packages/seahorse.xml
+
+ # Remove library link
+ rm -f debian/seahorse/usr/lib/*.so
+ rm -rf debian/seahorse/usr/include
+ rm -rf debian/seahorse/usr/lib/pkgconfig
+ find debian/seahorse -name '*.a' -exec rm -f {} \;
+ find debian/seahorse -name '*.la' -exec rm -f {} \;
+
+binary-indep:
+
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+
+ dh_install
+ dh_installdocs NEWS README TODO debian/NEWS.Debian
+ dh_installmenu
+ dh_installchangelogs ChangeLog
+ dh_installmime
+ dh_gconf
+ dh_scrollkeeper
+ dh_desktop
+ dh_link
+ dh_makeshlibs
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+
+.PHONY: configure build clean binary-indep binary-arch binary install
+
Propchange: desktop/unstable/seahorse/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/unstable/seahorse/debian/seahorse.Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/seahorse.Xsession?rev=10660&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/seahorse.Xsession (added)
+++ desktop/unstable/seahorse/debian/seahorse.Xsession Tue May 1 21:33:05 2007
@@ -1,0 +1,8 @@
+# This file is sourced by Xsession(5), not executed.
+
+SEAHORSE=/usr/bin/seahorse-agent
+
+if [ -x $SEAHORSE ]; then
+ STARTUP="$SEAHORSE --execute $STARTUP"
+fi
+
More information about the pkg-gnome-commits
mailing list