r13456 - in /desktop/unstable/seahorse/debian: ./ patches/
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Nov 15 18:51:24 UTC 2007
Author: joss
Date: Thu Nov 15 18:51:24 2007
New Revision: 13456
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13456
Log:
* Switch to cdbs and quilt.
* Update menu file to the latest version.
* 01_epiphany-path.patch: use the path in the pkg-config path to
install the extensions. Closes: #451012.
* Fix FSF address in copyright file.
* Convert the icon to XPM format, ship it and use it in the menu file.
* Rename NEWS.Debian to NEWS and format it correctly.
Added:
desktop/unstable/seahorse/debian/NEWS
- copied, changed from r13455, desktop/unstable/seahorse/debian/NEWS.Debian
desktop/unstable/seahorse/debian/install
desktop/unstable/seahorse/debian/patches/01_epiphany-path.patch
desktop/unstable/seahorse/debian/patches/02_mlock.patch
- copied, changed from r13455, desktop/unstable/seahorse/debian/patches/2_mlock.dpatch
desktop/unstable/seahorse/debian/patches/08_force_ssh.patch
- copied, changed from r13455, desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch
desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch
- copied, changed from r13455, desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch
desktop/unstable/seahorse/debian/patches/series
- copied, changed from r13455, desktop/unstable/seahorse/debian/patches/00list
desktop/unstable/seahorse/debian/seahorse.xpm
Removed:
desktop/unstable/seahorse/debian/NEWS.Debian
desktop/unstable/seahorse/debian/patches/00list
desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch
desktop/unstable/seahorse/debian/patches/2_mlock.dpatch
desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch
Modified:
desktop/unstable/seahorse/debian/ (props changed)
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/copyright
desktop/unstable/seahorse/debian/menu
desktop/unstable/seahorse/debian/rules
Propchange: desktop/unstable/seahorse/debian/
------------------------------------------------------------------------------
mergeWithUpstream = 1
Copied: desktop/unstable/seahorse/debian/NEWS (from r13455, desktop/unstable/seahorse/debian/NEWS.Debian)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/NEWS?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/NEWS.Debian (original)
+++ desktop/unstable/seahorse/debian/NEWS Thu Nov 15 18:51:24 2007
@@ -1,8 +1,8 @@
+seahorse (0.9.0-1) unstable; urgency=low
- 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.
+ * 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
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Tue, 21 March 2006 00:00:00 +0100
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Thu Nov 15 18:51:24 2007
@@ -1,3 +1,15 @@
+seahorse (2.20.1-2) unstable; urgency=low
+
+ * Switch to cdbs and quilt.
+ * Update menu file to the latest version.
+ * 01_epiphany-path.patch: use the path in the pkg-config path to
+ install the extensions. Closes: #451012.
+ * Fix FSF address in copyright file.
+ * Convert the icon to XPM format, ship it and use it in the menu file.
+ * Rename NEWS.Debian to NEWS and format it correctly.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 15 Nov 2007 19:44:06 +0100
+
seahorse (2.20.1-1) unstable; urgency=low
* New upstream bugfix release, works with gedit 2.20:
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control (original)
+++ desktop/unstable/seahorse/debian/control Thu Nov 15 18:51:24 2007
@@ -2,15 +2,15 @@
Section: gnome
Priority: optional
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
+ cdbs (>= 0.4.41),
+ quilt,
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,
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Thu Nov 15 18:51:24 2007
@@ -4,13 +4,13 @@
Maintainer: Jose Carlos Garcia Sogo <jsogo at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
+ cdbs (>= 0.4.41),
+ quilt,
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,
Modified: desktop/unstable/seahorse/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/copyright?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/copyright (original)
+++ desktop/unstable/seahorse/debian/copyright Thu Nov 15 18:51:24 2007
@@ -36,7 +36,7 @@
Version 1.1, March 2000
Copyright (C) 2000 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Added: desktop/unstable/seahorse/debian/install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/install?rev=13456&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/install (added)
+++ desktop/unstable/seahorse/debian/install Thu Nov 15 18:51:24 2007
@@ -1,0 +1,1 @@
+debian/seahorse.xpm /usr/share/pixmaps/
Modified: desktop/unstable/seahorse/debian/menu
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/menu?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/menu (original)
+++ desktop/unstable/seahorse/debian/menu Thu Nov 15 18:51:24 2007
@@ -1,7 +1,7 @@
?package(seahorse):needs="X11" \
- section="Apps/Tools" \
+ section="Applications/System/Security" \
hints="Gnome" \
title="Seahorse" \
longtitle="A GNOME frontend for GnuPG" \
command="/usr/bin/seahorse" \
- icon="/usr/share/pixmaps/seahorse.png"
+ icon="/usr/share/pixmaps/seahorse.xpm"
Added: desktop/unstable/seahorse/debian/patches/01_epiphany-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/01_epiphany-path.patch?rev=13456&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/patches/01_epiphany-path.patch (added)
+++ desktop/unstable/seahorse/debian/patches/01_epiphany-path.patch Thu Nov 15 18:51:24 2007
@@ -1,0 +1,28 @@
+Index: seahorse-2.20.1/configure.in
+===================================================================
+--- seahorse-2.20.1.orig/configure.in 2007-11-15 18:59:59.438717052 +0100
++++ seahorse-2.20.1/configure.in 2007-11-15 19:03:47.927737900 +0100
+@@ -566,7 +566,10 @@ else
+
+ EPIPHANY_EXTENSION_INIT([$E_API_VERSION], [$EPIPHANY_REQUIRED])
+ AC_SUBST([E_API_VERSION])
+-
++
++ EPIPHANY_EXTENSIONS_DIR=$(pkg-config --variable=extensionsdir epiphany-$E_API_VERSION)
++ AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
++
+ AC_SUBST([EPIPHANY_DEPENDENCY_CFLAGS])
+ AC_SUBST([EPIPHANY_DEPENDENCY_LIBS])
+ AC_SUBST([MOZILLA_COMPONENT_CFLAGS])
+Index: seahorse-2.20.1/plugins/epiphany/Makefile.am
+===================================================================
+--- seahorse-2.20.1.orig/plugins/epiphany/Makefile.am 2007-11-15 19:02:01.417668237 +0100
++++ seahorse-2.20.1/plugins/epiphany/Makefile.am 2007-11-15 19:02:45.244165766 +0100
+@@ -1,6 +1,6 @@
+ SUBDIRS = mozilla
+
+-extensiondir = $(libdir)/epiphany/$(E_API_VERSION)/extensions
++extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
+ extension_LTLIBRARIES = libseahorseextension.la
+
+ libseahorseextension_la_SOURCES = \
Copied: desktop/unstable/seahorse/debian/patches/02_mlock.patch (from r13455, desktop/unstable/seahorse/debian/patches/2_mlock.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/02_mlock.patch?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/2_mlock.dpatch (original)
+++ desktop/unstable/seahorse/debian/patches/02_mlock.patch Thu Nov 15 18:51:24 2007
@@ -1,7 +1,3 @@
-#! /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
@@ -67,10 +67,11 @@
Copied: desktop/unstable/seahorse/debian/patches/08_force_ssh.patch (from r13455, desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/08_force_ssh.patch?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/8_force_ssh.dpatch (original)
+++ desktop/unstable/seahorse/debian/patches/08_force_ssh.patch Thu Nov 15 18:51:24 2007
@@ -1,15 +1,8 @@
-#! /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 @@
+Index: seahorse-2.20.1/configure.in
+===================================================================
+--- seahorse-2.20.1.orig/configure.in 2007-11-15 19:03:47.927737900 +0100
++++ seahorse-2.20.1/configure.in 2007-11-15 19:03:54.240097620 +0100
+@@ -717,19 +717,19 @@ if test "x$enable_ssh" = "xno"; then
echo "disabling ssh support"
else
Copied: desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch (from r13455, desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/10_relibtoolize.dpatch (original)
+++ desktop/unstable/seahorse/debian/patches/10_relibtoolize.patch Thu Nov 15 18:51:24 2007
@@ -1,11 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
- at DPATCH@
-
-diff -Naur seahorse-2.20.1.old/aclocal.m4 seahorse-2.20.1/aclocal.m4
---- seahorse-2.20.1.old/aclocal.m4 2007-10-15 18:15:54.000000000 +0200
-+++ seahorse-2.20.1/aclocal.m4 2007-10-16 13:22:56.000000000 +0200
-@@ -266,7 +266,7 @@
+Index: seahorse-2.20.1/aclocal.m4
+===================================================================
+--- seahorse-2.20.1.orig/aclocal.m4 2007-11-15 18:59:44.045839862 +0100
++++ seahorse-2.20.1/aclocal.m4 2007-11-15 19:04:02.000539863 +0100
+@@ -266,7 +266,7 @@ glib_DEFUN([GLIB_WITH_NLS],
AC_CHECK_FUNCS(dcgettext)
MSGFMT_OPTS=
AC_MSG_CHECKING([if msgfmt accepts -c])
@@ -14,7 +11,7 @@
msgid ""
msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
-@@ -492,7 +492,7 @@
+@@ -492,7 +492,7 @@ fi])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -23,7 +20,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -655,7 +655,7 @@
+@@ -655,7 +655,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -32,7 +29,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -742,8 +742,9 @@
+@@ -742,8 +742,9 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -44,7 +41,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -755,8 +756,9 @@
+@@ -755,8 +756,9 @@ $rm conftest*
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -56,7 +53,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -772,12 +774,20 @@
+@@ -772,12 +774,20 @@ $rm conftest*
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -82,7 +79,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1008,13 +1018,17 @@
+@@ -1008,13 +1018,17 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -101,7 +98,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1031,6 +1045,9 @@
+@@ -1031,6 +1045,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
;;
*64-bit*)
case $host in
@@ -111,7 +108,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -1102,7 +1119,7 @@
+@@ -1102,7 +1119,7 @@ AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -120,7 +117,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -1143,11 +1160,12 @@
+@@ -1143,11 +1160,12 @@ fi
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -135,7 +132,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -1261,24 +1279,27 @@
+@@ -1261,24 +1279,27 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d
fi
;;
*)
@@ -180,7 +177,7 @@
;;
esac
])
-@@ -1505,7 +1526,8 @@
+@@ -1505,7 +1526,8 @@ fi
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -190,7 +187,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -1513,7 +1535,7 @@
+@@ -1513,7 +1535,7 @@ AC_CACHE_CHECK([if $compiler supports -c
mkdir conftest
cd conftest
mkdir out
@@ -199,7 +196,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1653,6 +1675,7 @@
+@@ -1653,6 +1675,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -207,7 +204,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1670,7 +1693,8 @@
+@@ -1670,7 +1693,8 @@ fi
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -217,7 +214,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1684,20 +1708,58 @@
+@@ -1684,20 +1708,58 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -281,7 +278,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1854,12 +1916,8 @@
+@@ -1854,12 +1916,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -296,7 +293,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -1913,7 +1971,7 @@
+@@ -1913,7 +1971,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -305,7 +302,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -1976,7 +2034,7 @@
+@@ -1976,7 +2034,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -314,7 +311,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2047,7 +2105,7 @@
+@@ -2047,7 +2105,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -323,7 +320,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2153,6 +2211,10 @@
+@@ -2153,6 +2211,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -334,7 +331,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2258,7 +2320,8 @@
+@@ -2258,7 +2320,8 @@ fi
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -344,7 +341,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2519,7 +2582,7 @@
+@@ -2519,7 +2582,7 @@ m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -353,7 +350,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -2582,7 +2645,7 @@
+@@ -2582,7 +2645,7 @@ fi
# AC_PATH_MAGIC
# -------------
@@ -362,7 +359,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -2729,7 +2792,7 @@
+@@ -2729,7 +2792,7 @@ esac
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -371,7 +368,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2768,9 +2831,15 @@
+@@ -2768,9 +2831,15 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -390,7 +387,7 @@
;;
darwin* | rhapsody*)
-@@ -2815,7 +2884,7 @@
+@@ -2815,7 +2884,7 @@ hpux10.20* | hpux11*)
esac
;;
@@ -399,7 +396,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
-@@ -2865,6 +2934,10 @@
+@@ -2865,6 +2934,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -410,7 +407,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2917,7 +2990,7 @@
+@@ -2917,7 +2990,7 @@ AC_DEFUN([AC_PROG_NM],
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -419,7 +416,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3133,10 +3206,10 @@
+@@ -3133,10 +3206,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -432,7 +429,7 @@
_LT_AC_SYS_COMPILER
-@@ -3238,10 +3311,10 @@
+@@ -3238,10 +3311,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -445,7 +442,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3387,7 +3460,7 @@
+@@ -3387,7 +3460,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -454,7 +451,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3546,10 +3619,10 @@
+@@ -3546,10 +3619,10 @@ case $host_os in
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -467,7 +464,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -3632,9 +3705,7 @@
+@@ -3632,9 +3705,7 @@ case $host_os in
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -478,7 +475,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -3702,7 +3773,7 @@
+@@ -3702,7 +3773,7 @@ case $host_os in
;;
esac
;;
@@ -487,7 +484,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -3822,6 +3893,29 @@
+@@ -3822,6 +3893,29 @@ case $host_os in
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -517,7 +514,7 @@
esac
;;
lynxos*)
-@@ -3860,16 +3954,20 @@
+@@ -3860,16 +3954,20 @@ case $host_os in
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -547,7 +544,7 @@
;;
osf3*)
case $cc_basename in
-@@ -4031,15 +4129,10 @@
+@@ -4031,15 +4129,10 @@ case $host_os in
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -566,7 +563,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4086,6 +4179,12 @@
+@@ -4086,6 +4179,12 @@ case $host_os in
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -579,7 +576,7 @@
fi
;;
esac
-@@ -4329,7 +4428,7 @@
+@@ -4329,7 +4428,7 @@ $rm -f confest.$objext
# PORTME: override above test on systems where it is broken
ifelse([$1],[CXX],
[case $host_os in
@@ -588,7 +585,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
-@@ -4337,13 +4436,46 @@
+@@ -4337,13 +4436,46 @@ interix3*)
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -636,7 +633,7 @@
;;
esac
;;
-@@ -4392,10 +4524,17 @@
+@@ -4392,10 +4524,17 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -656,7 +653,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4474,10 +4613,10 @@
+@@ -4474,10 +4613,10 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -669,7 +666,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4530,7 +4669,7 @@
+@@ -4530,7 +4669,7 @@ objext=o
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -678,7 +675,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4619,6 +4758,7 @@
+@@ -4619,6 +4758,7 @@ if test -f "$ltmain"; then
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -686,7 +683,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -4665,7 +4805,7 @@
+@@ -4665,7 +4805,7 @@ ifelse([$1], [],
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -695,7 +692,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -4990,7 +5130,7 @@
+@@ -4990,7 +5130,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -704,7 +701,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5073,6 +5213,7 @@
+@@ -5073,6 +5213,7 @@ fi
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -712,7 +709,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5299,12 +5440,14 @@
+@@ -5299,12 +5440,14 @@ AC_MSG_CHECKING([for $compiler option to
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -729,7 +726,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -5316,7 +5459,7 @@
+@@ -5316,7 +5459,7 @@ AC_MSG_CHECKING([for $compiler option to
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -738,7 +735,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5452,6 +5595,14 @@
+@@ -5452,6 +5595,14 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -753,7 +750,7 @@
;;
esac
;;
-@@ -5572,13 +5723,15 @@
+@@ -5572,13 +5723,15 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -771,7 +768,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
;;
-@@ -5588,7 +5741,7 @@
+@@ -5588,7 +5741,7 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -780,7 +777,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5646,7 +5799,7 @@
+@@ -5646,7 +5799,7 @@ AC_MSG_CHECKING([for $compiler option to
esac
;;
@@ -789,7 +786,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-@@ -5698,6 +5851,22 @@
+@@ -5698,6 +5851,22 @@ AC_MSG_CHECKING([for $compiler option to
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -812,7 +809,7 @@
esac
;;
-@@ -5707,6 +5876,10 @@
+@@ -5707,6 +5876,10 @@ AC_MSG_CHECKING([for $compiler option to
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -823,7 +820,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5801,7 +5974,8 @@
+@@ -5801,7 +5974,8 @@ AC_LIBTOOL_LINKER_OPTION([if $compiler s
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -833,7 +830,7 @@
ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -5818,7 +5992,7 @@
+@@ -5818,7 +5992,7 @@ ifelse([$1],[CXX],[
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -842,7 +839,7 @@
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -5960,7 +6134,7 @@
+@@ -5960,7 +6134,7 @@ EOF
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -851,7 +848,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -5978,7 +6152,7 @@
+@@ -5978,7 +6152,7 @@ EOF
fi
;;
@@ -860,7 +857,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -5993,7 +6167,7 @@
+@@ -5993,7 +6167,7 @@ EOF
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -869,7 +866,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6011,13 +6185,22 @@
+@@ -6011,13 +6185,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -894,7 +891,7 @@
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -6058,7 +6241,7 @@
+@@ -6058,7 +6241,7 @@ EOF
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -903,7 +900,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -6177,7 +6360,7 @@
+@@ -6177,7 +6360,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -912,7 +909,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6270,7 +6453,7 @@
+@@ -6270,7 +6453,7 @@ _LT_EOF
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -921,7 +918,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -6312,10 +6495,10 @@
+@@ -6312,10 +6495,10 @@ _LT_EOF
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -934,7 +931,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -6477,24 +6660,28 @@
+@@ -6477,24 +6660,28 @@ _LT_EOF
;;
openbsd*)
@@ -980,7 +977,7 @@
fi
;;
-@@ -6553,17 +6740,16 @@
+@@ -6553,17 +6740,16 @@ _LT_EOF
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1007,7 +1004,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6620,7 +6806,7 @@
+@@ -6620,7 +6806,7 @@ _LT_EOF
fi
;;
@@ -1016,7 +1013,7 @@
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -6695,7 +6881,7 @@
+@@ -6695,7 +6881,7 @@ x|xyes)
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1025,7 +1022,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -6798,6 +6984,30 @@
+@@ -6798,6 +6984,30 @@ AC_DEFUN([LT_AC_PROG_RC],
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1056,7 +1053,7 @@
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
-@@ -6818,12 +7028,13 @@
+@@ -6818,12 +7028,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1071,7 +1068,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -6856,6 +7067,7 @@
+@@ -6856,6 +7067,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xp
done
])
SED=$lt_cv_path_SED
@@ -1079,7 +1076,7 @@
AC_MSG_RESULT([$SED])
])
-@@ -7007,7 +7219,7 @@
+@@ -7007,7 +7219,7 @@ path to pkg-config.
_PKG_TEXT
@@ -1088,10 +1085,11 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-diff -Naur seahorse-2.20.1.old/agent/Makefile.in seahorse-2.20.1/agent/Makefile.in
---- seahorse-2.20.1.old/agent/Makefile.in 2007-10-15 18:16:05.000000000 +0200
-+++ seahorse-2.20.1/agent/Makefile.in 2007-10-16 13:23:04.000000000 +0200
-@@ -170,14 +170,12 @@
+Index: seahorse-2.20.1/agent/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/agent/Makefile.in 2007-11-15 18:59:44.001837355 +0100
++++ seahorse-2.20.1/agent/Makefile.in 2007-11-15 19:06:00.139272205 +0100
+@@ -170,14 +170,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -1107,7 +1105,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -189,7 +187,6 @@
+@@ -189,7 +187,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -1115,7 +1113,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -239,15 +236,13 @@
+@@ -239,15 +236,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -1132,12 +1130,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/config.guess seahorse-2.20.1/config.guess
-diff -Naur seahorse-2.20.1.old/config.sub seahorse-2.20.1/config.sub
-diff -Naur seahorse-2.20.1.old/configure seahorse-2.20.1/configure
---- seahorse-2.20.1.old/configure 2007-10-15 18:16:03.000000000 +0200
-+++ seahorse-2.20.1/configure 2007-10-16 13:23:02.000000000 +0200
-@@ -847,14 +847,11 @@
+Index: seahorse-2.20.1/configure
+===================================================================
+--- seahorse-2.20.1.orig/configure 2007-11-15 18:59:43.985836443 +0100
++++ seahorse-2.20.1/configure 2007-11-15 19:05:14.920695346 +0100
+@@ -847,14 +847,11 @@ INTLTOOL_CAVES_RULE
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
@@ -1153,7 +1150,7 @@
ALL_LINGUAS
CC
CFLAGS
-@@ -881,6 +878,7 @@
+@@ -881,6 +878,7 @@ host
host_cpu
host_vendor
host_os
@@ -1161,7 +1158,7 @@
GREP
EGREP
LN_S
-@@ -996,9 +994,6 @@
+@@ -996,9 +994,6 @@ WITH_APPLET_TRUE
WITH_APPLET_FALSE
LIBNOTIFY_CFLAGS
LIBNOTIFY_LIBS
@@ -1171,7 +1168,7 @@
WITH_SSH_TRUE
WITH_SSH_FALSE
LIBEBOOK_CFLAGS
-@@ -3847,6 +3842,8 @@
+@@ -3847,6 +3842,8 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
@@ -1180,7 +1177,7 @@
-@@ -3938,171 +3935,6 @@
+@@ -3938,171 +3935,6 @@ echo "$as_me: error: XML::Parser perl mo
fi
fi
@@ -1352,7 +1349,7 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -4120,7 +3952,7 @@
+@@ -4120,7 +3952,7 @@ int
main ()
{
extern int _nl_msg_cat_cntr;
@@ -1361,7 +1358,7 @@
;
return 0;
}
-@@ -4425,12 +4257,13 @@
+@@ -4425,12 +4257,13 @@ do
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1376,7 +1373,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4465,6 +4298,7 @@
+@@ -4465,6 +4298,7 @@ done
fi
SED=$lt_cv_path_SED
@@ -1384,7 +1381,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -4826,8 +4660,8 @@
+@@ -4826,8 +4660,8 @@ else
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -1395,7 +1392,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4868,9 +4702,15 @@
+@@ -4868,9 +4702,15 @@ cygwin*)
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -1414,7 +1411,7 @@
;;
darwin* | rhapsody*)
-@@ -4915,7 +4755,7 @@
+@@ -4915,7 +4755,7 @@ hpux10.20* | hpux11*)
esac
;;
@@ -1423,7 +1420,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -4965,6 +4805,10 @@
+@@ -4965,6 +4805,10 @@ osf3* | osf4* | osf5*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -1434,7 +1431,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5051,7 +4895,7 @@
+@@ -5051,7 +4895,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
@@ -1443,7 +1440,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -5086,7 +4930,8 @@
+@@ -5086,7 +4930,8 @@ ia64-*-hpux*)
rm -rf conftest*
;;
@@ -1453,7 +1450,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5097,6 +4942,9 @@
+@@ -5097,6 +4942,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -1463,7 +1460,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -5113,6 +4961,9 @@
+@@ -5113,6 +4961,9 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li
;;
*64-bit*)
case $host in
@@ -1473,7 +1470,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -6900,24 +6751,27 @@
+@@ -6900,24 +6751,27 @@ else
fi
;;
*)
@@ -1518,7 +1515,7 @@
;;
esac
-@@ -6934,6 +6788,7 @@
+@@ -6934,6 +6788,7 @@ fi
@@ -1526,7 +1523,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -7522,7 +7377,7 @@
+@@ -7522,7 +7377,7 @@ test -z "$STRIP" && STRIP=:
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -1535,7 +1532,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -7722,10 +7577,10 @@
+@@ -7722,10 +7577,10 @@ objext=o
objext=$objext
# Code to be used in simple compile tests
@@ -1548,7 +1545,7 @@
# If no C compiler was specified, use CC.
-@@ -7740,13 +7595,13 @@
+@@ -7740,13 +7595,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -1564,7 +1561,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -7766,7 +7621,7 @@
+@@ -7766,7 +7621,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -1573,7 +1570,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7777,11 +7632,11 @@
+@@ -7777,11 +7632,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -1587,7 +1584,7 @@
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.
-@@ -7832,13 +7687,15 @@
+@@ -7832,13 +7687,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1605,7 +1602,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -7848,7 +7705,7 @@
+@@ -7848,7 +7705,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic='-fno-common'
;;
@@ -1614,7 +1611,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -7906,7 +7763,7 @@
+@@ -7906,7 +7763,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -1623,7 +1620,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7958,6 +7815,22 @@
+@@ -7958,6 +7815,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -1646,7 +1643,7 @@
esac
;;
-@@ -7967,6 +7840,10 @@
+@@ -7967,6 +7840,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static='-non_shared'
;;
@@ -1657,7 +1654,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -8034,7 +7911,7 @@
+@@ -8034,7 +7911,7 @@ if test "${lt_prog_compiler_pic_works+se
else
lt_prog_compiler_pic_works=no
ac_outfile=conftest.$ac_objext
@@ -1666,7 +1663,7 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -8045,11 +7922,11 @@
+@@ -8045,11 +7922,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -1680,7 +1677,7 @@
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.
-@@ -8098,7 +7975,7 @@
+@@ -8098,7 +7975,7 @@ else
lt_prog_compiler_static_works=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -1689,7 +1686,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -8138,7 +8015,7 @@
+@@ -8138,7 +8015,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -1698,7 +1695,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8149,11 +8026,11 @@
+@@ -8149,11 +8026,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -1712,7 +1709,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8345,7 +8222,7 @@
+@@ -8345,7 +8222,7 @@ EOF
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -1721,7 +1718,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8363,7 +8240,7 @@
+@@ -8363,7 +8240,7 @@ EOF
fi
;;
@@ -1730,7 +1727,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8378,7 +8255,7 @@
+@@ -8378,7 +8255,7 @@ EOF
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -1739,7 +1736,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8396,13 +8273,22 @@
+@@ -8396,13 +8273,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1764,7 +1761,7 @@
fi
link_all_deplibs=no
else
-@@ -8562,7 +8448,7 @@
+@@ -8562,7 +8448,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1773,7 +1770,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -8636,11 +8522,18 @@
+@@ -8636,11 +8522,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1796,7 +1793,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8695,11 +8588,18 @@
+@@ -8695,11 +8588,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -1819,7 +1816,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8753,7 +8653,7 @@
+@@ -8753,7 +8653,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds='true'
# FIXME: Should let the user specify the lib program.
@@ -1828,7 +1825,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -8795,10 +8695,10 @@
+@@ -8795,10 +8695,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -1841,7 +1838,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -8960,24 +8860,28 @@
+@@ -8960,24 +8860,28 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -1887,7 +1884,7 @@
fi
;;
-@@ -9036,17 +8940,16 @@
+@@ -9036,17 +8940,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -1914,7 +1911,7 @@
esac
link_all_deplibs=yes
;;
-@@ -9103,7 +9006,7 @@
+@@ -9103,7 +9006,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -1923,7 +1920,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -9180,7 +9083,7 @@
+@@ -9180,7 +9083,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -1932,7 +1929,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -9238,17 +9141,55 @@
+@@ -9238,17 +9141,55 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -1992,7 +1989,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9408,12 +9349,8 @@
+@@ -9408,12 +9349,8 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2007,7 +2004,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -9467,7 +9404,7 @@
+@@ -9467,7 +9404,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2016,7 +2013,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -9530,7 +9467,7 @@
+@@ -9530,7 +9467,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -2025,7 +2022,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9601,7 +9538,7 @@
+@@ -9601,7 +9538,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -2034,7 +2031,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -9707,6 +9644,10 @@
+@@ -9707,6 +9644,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -2045,7 +2042,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -9860,6 +9801,7 @@
+@@ -9860,6 +9801,7 @@ else
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -2053,7 +2050,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -10446,7 +10388,7 @@
+@@ -10446,7 +10388,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -2062,7 +2059,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10546,7 +10488,7 @@
+@@ -10546,7 +10488,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
@@ -2071,7 +2068,7 @@
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10744,6 +10686,7 @@
+@@ -10744,6 +10686,7 @@ if test -f "$ltmain"; then
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -2079,7 +2076,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -10788,7 +10731,7 @@
+@@ -10788,7 +10731,7 @@ echo "$as_me: creating $ofile" >&6;}
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -2088,7 +2085,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -11112,7 +11055,7 @@
+@@ -11112,7 +11055,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2097,7 +2094,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -11281,10 +11224,10 @@
+@@ -11281,10 +11224,10 @@ objext=o
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -2110,7 +2107,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -11300,13 +11243,13 @@
+@@ -11300,13 +11243,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -2126,7 +2123,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -11565,7 +11508,7 @@
+@@ -11565,7 +11508,7 @@ case $host_os in
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -2135,7 +2132,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -11639,11 +11582,18 @@
+@@ -11639,11 +11582,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2158,7 +2155,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11699,11 +11649,18 @@
+@@ -11699,11 +11649,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2181,7 +2178,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11822,10 +11779,10 @@
+@@ -11822,10 +11779,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -2194,7 +2191,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -11908,9 +11865,7 @@
+@@ -11908,9 +11865,7 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -2205,7 +2202,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -11978,7 +11933,7 @@
+@@ -11978,7 +11933,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
esac
;;
@@ -2214,7 +2211,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -12098,6 +12053,29 @@
+@@ -12098,6 +12053,29 @@ if test -z "$aix_libpath"; then aix_libp
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -2244,7 +2241,7 @@
esac
;;
lynxos*)
-@@ -12136,16 +12114,20 @@
+@@ -12136,16 +12114,20 @@ if test -z "$aix_libpath"; then aix_libp
ld_shlibs_CXX=no
;;
openbsd*)
@@ -2274,7 +2271,7 @@
;;
osf3*)
case $cc_basename in
-@@ -12307,15 +12289,10 @@
+@@ -12307,15 +12289,10 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -2293,7 +2290,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -12362,6 +12339,12 @@
+@@ -12362,6 +12339,12 @@ if test -z "$aix_libpath"; then aix_libp
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -2306,7 +2303,7 @@
fi
;;
esac
-@@ -12553,7 +12536,7 @@
+@@ -12553,7 +12536,7 @@ $rm -f confest.$objext
# PORTME: override above test on systems where it is broken
case $host_os in
@@ -2315,7 +2312,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -12561,13 +12544,46 @@
+@@ -12561,13 +12544,46 @@ interix3*)
postdeps_CXX=
;;
@@ -2363,7 +2360,7 @@
;;
esac
;;
-@@ -12604,12 +12620,14 @@
+@@ -12604,12 +12620,14 @@ echo $ECHO_N "checking for $compiler opt
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2380,7 +2377,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -12621,7 +12639,7 @@
+@@ -12621,7 +12639,7 @@ echo $ECHO_N "checking for $compiler opt
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -2389,7 +2386,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12757,6 +12775,14 @@
+@@ -12757,6 +12775,14 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -2404,7 +2401,7 @@
;;
esac
;;
-@@ -12871,7 +12897,7 @@
+@@ -12871,7 +12897,7 @@ if test "${lt_prog_compiler_pic_works_CX
else
lt_prog_compiler_pic_works_CXX=no
ac_outfile=conftest.$ac_objext
@@ -2413,7 +2410,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -12882,11 +12908,11 @@
+@@ -12882,11 +12908,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2427,7 +2424,7 @@
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.
-@@ -12935,7 +12961,7 @@
+@@ -12935,7 +12961,7 @@ else
lt_prog_compiler_static_works_CXX=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -2436,7 +2433,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -12975,7 +13001,7 @@
+@@ -12975,7 +13001,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -2445,7 +2442,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -12986,11 +13012,11 @@
+@@ -12986,11 +13012,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2459,7 +2456,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -13056,7 +13082,7 @@
+@@ -13056,7 +13082,7 @@ echo $ECHO_N "checking whether the $comp
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -2468,7 +2465,7 @@
;;
linux* | k*bsd*-gnu)
link_all_deplibs_CXX=no
-@@ -13090,7 +13116,7 @@
+@@ -13090,7 +13116,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -2477,7 +2474,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -13148,20 +13174,7 @@
+@@ -13148,20 +13174,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2499,7 +2496,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13318,12 +13331,7 @@
+@@ -13318,12 +13331,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2513,7 +2510,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13377,7 +13385,7 @@
+@@ -13377,7 +13385,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2522,7 +2519,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13440,7 +13448,7 @@
+@@ -13440,7 +13448,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -2531,7 +2528,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13511,7 +13519,7 @@
+@@ -13511,7 +13519,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -2540,7 +2537,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -13617,6 +13625,10 @@
+@@ -13617,6 +13625,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -2551,7 +2548,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -13811,6 +13823,7 @@
+@@ -13811,6 +13823,7 @@ if test -f "$ltmain"; then
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -2559,7 +2556,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -14131,7 +14144,7 @@
+@@ -14131,7 +14144,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -2568,7 +2565,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -14222,10 +14235,17 @@
+@@ -14222,10 +14235,17 @@ objext=o
objext_F77=$objext
# Code to be used in simple compile tests
@@ -2588,7 +2585,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -14241,13 +14261,13 @@
+@@ -14241,13 +14261,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -2604,7 +2601,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -14334,13 +14354,15 @@
+@@ -14334,13 +14354,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -2622,7 +2619,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -14350,7 +14372,7 @@
+@@ -14350,7 +14372,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -2631,7 +2628,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14408,7 +14430,7 @@
+@@ -14408,7 +14430,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -2640,7 +2637,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14460,6 +14482,22 @@
+@@ -14460,6 +14482,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -2663,7 +2660,7 @@
esac
;;
-@@ -14469,6 +14507,10 @@
+@@ -14469,6 +14507,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -2674,7 +2671,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -14536,7 +14578,7 @@
+@@ -14536,7 +14578,7 @@ if test "${lt_prog_compiler_pic_works_F7
else
lt_prog_compiler_pic_works_F77=no
ac_outfile=conftest.$ac_objext
@@ -2683,7 +2680,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14547,11 +14589,11 @@
+@@ -14547,11 +14589,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2697,7 +2694,7 @@
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.
-@@ -14600,7 +14642,7 @@
+@@ -14600,7 +14642,7 @@ else
lt_prog_compiler_static_works_F77=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -2706,7 +2703,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14640,7 +14682,7 @@
+@@ -14640,7 +14682,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -2715,7 +2712,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14651,11 +14693,11 @@
+@@ -14651,11 +14693,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -2729,7 +2726,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14847,7 +14889,7 @@
+@@ -14847,7 +14889,7 @@ EOF
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -2738,7 +2735,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -14865,7 +14907,7 @@
+@@ -14865,7 +14907,7 @@ EOF
fi
;;
@@ -2747,7 +2744,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14880,7 +14922,7 @@
+@@ -14880,7 +14922,7 @@ EOF
archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -2756,7 +2753,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -14898,13 +14940,22 @@
+@@ -14898,13 +14940,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -2781,7 +2778,7 @@
fi
link_all_deplibs_F77=no
else
-@@ -15064,7 +15115,7 @@
+@@ -15064,7 +15115,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -2790,7 +2787,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -15128,11 +15179,18 @@
+@@ -15128,11 +15179,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2813,7 +2810,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15177,11 +15235,18 @@
+@@ -15177,11 +15235,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -2836,7 +2833,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15235,7 +15300,7 @@
+@@ -15235,7 +15300,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_F77='true'
# FIXME: Should let the user specify the lib program.
@@ -2845,7 +2842,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -15277,10 +15342,10 @@
+@@ -15277,10 +15342,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -2858,7 +2855,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -15442,24 +15507,28 @@
+@@ -15442,24 +15507,28 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -2904,7 +2901,7 @@
fi
;;
-@@ -15518,17 +15587,16 @@
+@@ -15518,17 +15587,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -2931,7 +2928,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -15585,7 +15653,7 @@
+@@ -15585,7 +15653,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -2940,7 +2937,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -15662,7 +15730,7 @@
+@@ -15662,7 +15730,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -2949,7 +2946,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -15720,20 +15788,7 @@
+@@ -15720,20 +15788,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -2971,7 +2968,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15890,12 +15945,7 @@
+@@ -15890,12 +15945,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2985,7 +2982,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -15949,7 +15999,7 @@
+@@ -15949,7 +15999,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -2994,7 +2991,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -16012,7 +16062,7 @@
+@@ -16012,7 +16062,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -3003,7 +3000,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -16083,7 +16133,7 @@
+@@ -16083,7 +16133,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -3012,7 +3009,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -16189,6 +16239,10 @@
+@@ -16189,6 +16239,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3023,7 +3020,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -16383,6 +16437,7 @@
+@@ -16383,6 +16437,7 @@ if test -f "$ltmain"; then
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -3031,7 +3028,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -16703,7 +16758,7 @@
+@@ -16703,7 +16758,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3040,7 +3037,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -16761,10 +16816,10 @@
+@@ -16761,10 +16816,10 @@ objext=o
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -3053,7 +3050,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -16780,13 +16835,13 @@
+@@ -16780,13 +16835,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -3069,7 +3066,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -16827,7 +16882,7 @@
+@@ -16827,7 +16882,7 @@ if test "${lt_cv_prog_compiler_rtti_exce
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -3078,7 +3075,7 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16838,11 +16893,11 @@
+@@ -16838,11 +16893,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3092,7 +3089,7 @@
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.
-@@ -16893,13 +16948,15 @@
+@@ -16893,13 +16948,15 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -3110,7 +3107,7 @@
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
;;
-@@ -16909,7 +16966,7 @@
+@@ -16909,7 +16966,7 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -3119,7 +3116,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -16967,7 +17024,7 @@
+@@ -16967,7 +17024,7 @@ echo $ECHO_N "checking for $compiler opt
esac
;;
@@ -3128,7 +3125,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-@@ -17019,6 +17076,22 @@
+@@ -17019,6 +17076,22 @@ echo $ECHO_N "checking for $compiler opt
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -3151,7 +3148,7 @@
esac
;;
-@@ -17028,6 +17101,10 @@
+@@ -17028,6 +17101,10 @@ echo $ECHO_N "checking for $compiler opt
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -3162,7 +3159,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -17095,7 +17172,7 @@
+@@ -17095,7 +17172,7 @@ if test "${lt_prog_compiler_pic_works_GC
else
lt_prog_compiler_pic_works_GCJ=no
ac_outfile=conftest.$ac_objext
@@ -3171,7 +3168,7 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -17106,11 +17183,11 @@
+@@ -17106,11 +17183,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3185,7 +3182,7 @@
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.
-@@ -17159,7 +17236,7 @@
+@@ -17159,7 +17236,7 @@ else
lt_prog_compiler_static_works_GCJ=no
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
@@ -3194,7 +3191,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -17199,7 +17276,7 @@
+@@ -17199,7 +17276,7 @@ else
mkdir conftest
cd conftest
mkdir out
@@ -3203,7 +3200,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -17210,11 +17287,11 @@
+@@ -17210,11 +17287,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
@@ -3217,7 +3214,7 @@
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17406,7 +17483,7 @@
+@@ -17406,7 +17483,7 @@ EOF
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -3226,7 +3223,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -17424,7 +17501,7 @@
+@@ -17424,7 +17501,7 @@ EOF
fi
;;
@@ -3235,7 +3232,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17439,7 +17516,7 @@
+@@ -17439,7 +17516,7 @@ EOF
archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -3244,7 +3241,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17457,13 +17534,22 @@
+@@ -17457,13 +17534,22 @@ EOF
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -3269,7 +3266,7 @@
fi
link_all_deplibs_GCJ=no
else
-@@ -17623,7 +17709,7 @@
+@@ -17623,7 +17709,7 @@ _LT_EOF
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -3278,7 +3275,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -17697,11 +17783,18 @@
+@@ -17697,11 +17783,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3301,7 +3298,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17756,11 +17849,18 @@
+@@ -17756,11 +17849,18 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -3324,7 +3321,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17814,7 +17914,7 @@
+@@ -17814,7 +17914,7 @@ if test -z "$aix_libpath"; then aix_libp
# The linker will automatically build a .lib file if we build a DLL.
old_archive_From_new_cmds_GCJ='true'
# FIXME: Should let the user specify the lib program.
@@ -3333,7 +3330,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -17856,10 +17956,10 @@
+@@ -17856,10 +17956,10 @@ if test -z "$aix_libpath"; then aix_libp
case $cc_basename in
xlc*)
output_verbose_link_cmd='echo'
@@ -3346,7 +3343,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -18021,24 +18121,28 @@
+@@ -18021,24 +18121,28 @@ if test -z "$aix_libpath"; then aix_libp
;;
openbsd*)
@@ -3392,7 +3389,7 @@
fi
;;
-@@ -18097,17 +18201,16 @@
+@@ -18097,17 +18201,16 @@ if test -z "$aix_libpath"; then aix_libp
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -3419,7 +3416,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -18164,7 +18267,7 @@
+@@ -18164,7 +18267,7 @@ if test -z "$aix_libpath"; then aix_libp
fi
;;
@@ -3428,7 +3425,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -18241,7 +18344,7 @@
+@@ -18241,7 +18344,7 @@ x|xyes)
{ echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
$rm conftest*
@@ -3437,7 +3434,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18299,20 +18402,7 @@
+@@ -18299,20 +18402,7 @@ shlibpath_overrides_runpath=unknown
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -3459,7 +3456,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18469,12 +18559,7 @@
+@@ -18469,12 +18559,7 @@ darwin* | rhapsody*)
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -3473,7 +3470,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -18528,7 +18613,7 @@
+@@ -18528,7 +18613,7 @@ freebsd* | dragonfly*)
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -3482,7 +3479,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18591,7 +18676,7 @@
+@@ -18591,7 +18676,7 @@ hpux9* | hpux10* | hpux11*)
postinstall_cmds='chmod 555 $lib'
;;
@@ -3491,7 +3488,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18662,7 +18747,7 @@
+@@ -18662,7 +18747,7 @@ linux* | k*bsd*-gnu)
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -3500,7 +3497,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -18768,6 +18853,10 @@
+@@ -18768,6 +18853,10 @@ osf3* | osf4* | osf5*)
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -3511,7 +3508,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -18962,6 +19051,7 @@
+@@ -18962,6 +19051,7 @@ if test -f "$ltmain"; then
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -3519,7 +3516,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -19282,7 +19372,7 @@
+@@ -19282,7 +19372,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3528,7 +3525,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -19339,7 +19429,7 @@
+@@ -19339,7 +19429,7 @@ objext=o
objext_RC=$objext
# Code to be used in simple compile tests
@@ -3537,7 +3534,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19358,13 +19448,13 @@
+@@ -19358,13 +19448,13 @@ compiler=$CC
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -3553,7 +3550,7 @@
eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_linker_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -19442,6 +19532,7 @@
+@@ -19442,6 +19532,7 @@ if test -f "$ltmain"; then
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -3561,7 +3558,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -19762,7 +19853,7 @@
+@@ -19762,7 +19853,7 @@ sys_lib_search_path_spec=$lt_sys_lib_sea
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -3570,7 +3567,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -21068,10 +21159,11 @@
+@@ -21068,10 +21159,11 @@ cat >>conftest.$ac_ext <<_ACEOF
return 2;
}
/* Configure is being run as root? */
@@ -3584,7 +3581,7 @@
return 0;
}
-@@ -21241,7 +21333,7 @@
+@@ -21241,7 +21333,7 @@ Alternatively, you may set the environme
and SEAHORSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3593,7 +3590,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -21251,7 +21343,7 @@
+@@ -21251,7 +21343,7 @@ Alternatively, you may set the environme
and SEAHORSE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3602,7 +3599,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -22691,7 +22783,7 @@
+@@ -22691,7 +22783,7 @@ Alternatively, you may set the environme
and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3611,7 +3608,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -22701,7 +22793,7 @@
+@@ -22701,7 +22793,7 @@ Alternatively, you may set the environme
and LIBCRYPTUI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -3620,7 +3617,17 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -47751,133 +47843,13 @@
+@@ -38548,6 +38640,9 @@ EPIPHANY_EXTENSION_RULE='%.ephy-extensio
+
+
+
++ EPIPHANY_EXTENSIONS_DIR=$(pkg-config --variable=extensionsdir epiphany-$E_API_VERSION)
++
++
+
+
+
+@@ -47751,133 +47846,13 @@ if test "x$enable_ssh" = "xno"; then
echo "disabling ssh support"
else
@@ -3761,7 +3768,7 @@
enable_ssh="yes"
cat >>confdefs.h <<\_ACEOF
-@@ -47886,20 +47858,20 @@
+@@ -47886,20 +47861,20 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
@@ -3786,7 +3793,7 @@
fi
-@@ -49297,8 +49269,8 @@
+@@ -49297,8 +49272,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -3797,7 +3804,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -50422,9 +50394,7 @@
+@@ -50422,9 +50397,7 @@ cat >>$CONFIG_STATUS <<_ACEOF
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -3808,7 +3815,7 @@
_ACEOF
-@@ -50610,14 +50580,11 @@
+@@ -50610,14 +50583,11 @@ INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE
INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
@@ -3824,7 +3831,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
CC!$CC$ac_delim
CFLAGS!$CFLAGS$ac_delim
-@@ -50627,6 +50594,9 @@
+@@ -50627,6 +50597,9 @@ ac_ct_CC!$ac_ct_CC$ac_delim
EXEEXT!$EXEEXT$ac_delim
OBJEXT!$OBJEXT$ac_delim
DEPDIR!$DEPDIR$ac_delim
@@ -3834,7 +3841,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -50668,9 +50638,6 @@
+@@ -50668,9 +50641,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3844,7 +3851,7 @@
AMDEP_FALSE!$AMDEP_FALSE$ac_delim
AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
CCDEPMODE!$CCDEPMODE$ac_delim
-@@ -50685,6 +50652,7 @@
+@@ -50685,6 +50655,7 @@ host!$host$ac_delim
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -3852,7 +3859,7 @@
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
LN_S!$LN_S$ac_delim
-@@ -50765,6 +50733,8 @@
+@@ -50765,6 +50736,8 @@ HAVE_MOZILLA_TOOLKIT_TRUE!$HAVE_MOZILLA_
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
@@ -3861,7 +3868,7 @@
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -50806,8 +50776,6 @@
+@@ -50806,8 +50779,6 @@ _ACEOF
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
@@ -3870,7 +3877,7 @@
HAVE_GECKO_1_8_TRUE!$HAVE_GECKO_1_8_TRUE$ac_delim
HAVE_GECKO_1_8_FALSE!$HAVE_GECKO_1_8_FALSE$ac_delim
HAVE_GECKO_1_8_1_TRUE!$HAVE_GECKO_1_8_1_TRUE$ac_delim
-@@ -50841,9 +50809,6 @@
+@@ -50841,9 +50812,6 @@ WITH_APPLET_TRUE!$WITH_APPLET_TRUE$ac_de
WITH_APPLET_FALSE!$WITH_APPLET_FALSE$ac_delim
LIBNOTIFY_CFLAGS!$LIBNOTIFY_CFLAGS$ac_delim
LIBNOTIFY_LIBS!$LIBNOTIFY_LIBS$ac_delim
@@ -3880,7 +3887,7 @@
WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim
WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim
LIBEBOOK_CFLAGS!$LIBEBOOK_CFLAGS$ac_delim
-@@ -50877,7 +50842,7 @@
+@@ -50877,7 +50845,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -3889,7 +3896,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -51448,10 +51413,6 @@
+@@ -51448,10 +51416,6 @@ done
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -3900,10 +3907,11 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-diff -Naur seahorse-2.20.1.old/daemon/Makefile.in seahorse-2.20.1/daemon/Makefile.in
---- seahorse-2.20.1.old/daemon/Makefile.in 2007-10-15 18:16:05.000000000 +0200
-+++ seahorse-2.20.1/daemon/Makefile.in 2007-10-16 13:23:04.000000000 +0200
-@@ -170,14 +170,12 @@
+Index: seahorse-2.20.1/daemon/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/daemon/Makefile.in 2007-11-15 18:59:43.945834163 +0100
++++ seahorse-2.20.1/daemon/Makefile.in 2007-11-15 19:06:00.267279500 +0100
+@@ -170,14 +170,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3919,7 +3927,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -189,7 +187,6 @@
+@@ -189,7 +187,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3927,7 +3935,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -239,15 +236,13 @@
+@@ -239,15 +236,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -3944,10 +3952,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/data/Makefile.in seahorse-2.20.1/data/Makefile.in
---- seahorse-2.20.1.old/data/Makefile.in 2007-10-15 18:16:05.000000000 +0200
-+++ seahorse-2.20.1/data/Makefile.in 2007-10-16 13:23:04.000000000 +0200
-@@ -132,14 +132,12 @@
+Index: seahorse-2.20.1/data/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/data/Makefile.in 2007-11-15 18:59:43.897831428 +0100
++++ seahorse-2.20.1/data/Makefile.in 2007-11-15 19:06:00.359284743 +0100
+@@ -132,14 +132,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -3963,7 +3972,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -151,7 +149,6 @@
+@@ -151,7 +149,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -3971,7 +3980,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -201,15 +198,13 @@
+@@ -201,15 +198,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -3988,10 +3997,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/gnome-doc-utils.make seahorse-2.20.1/gnome-doc-utils.make
---- seahorse-2.20.1.old/gnome-doc-utils.make 2007-10-15 18:15:47.000000000 +0200
-+++ seahorse-2.20.1/gnome-doc-utils.make 2007-10-16 13:22:48.000000000 +0200
-@@ -416,6 +416,11 @@
+Index: seahorse-2.20.1/gnome-doc-utils.make
+===================================================================
+--- seahorse-2.20.1.orig/gnome-doc-utils.make 2007-11-15 18:59:43.881830516 +0100
++++ seahorse-2.20.1/gnome-doc-utils.make 2007-11-15 19:04:02.044542370 +0100
+@@ -416,6 +416,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4003,7 +4013,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -486,6 +491,12 @@
+@@ -486,6 +491,12 @@ install-doc-docs:
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4016,7 +4026,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -554,7 +565,7 @@
+@@ -554,7 +565,7 @@ uninstall-doc-figs:
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -4025,10 +4035,11 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-diff -Naur seahorse-2.20.1.old/help/Makefile.in seahorse-2.20.1/help/Makefile.in
---- seahorse-2.20.1.old/help/Makefile.in 2007-10-15 18:16:05.000000000 +0200
-+++ seahorse-2.20.1/help/Makefile.in 2007-10-16 13:23:04.000000000 +0200
-@@ -147,14 +147,12 @@
+Index: seahorse-2.20.1/help/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/help/Makefile.in 2007-11-15 18:59:43.813826641 +0100
++++ seahorse-2.20.1/help/Makefile.in 2007-11-15 19:06:00.527294318 +0100
+@@ -147,14 +147,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4044,7 +4055,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -166,7 +164,6 @@
+@@ -166,7 +164,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4052,7 +4063,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -216,15 +213,13 @@
+@@ -216,15 +213,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4069,7 +4080,7 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -785,6 +780,11 @@
+@@ -785,6 +780,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4081,7 +4092,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -853,6 +853,12 @@
+@@ -853,6 +853,12 @@ install-doc-docs:
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -4094,7 +4105,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -920,7 +926,7 @@
+@@ -920,7 +926,7 @@ uninstall-doc-figs:
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -4103,9 +4114,10 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-diff -Naur seahorse-2.20.1.old/intltool-extract.in seahorse-2.20.1/intltool-extract.in
---- seahorse-2.20.1.old/intltool-extract.in 2007-10-15 18:15:46.000000000 +0200
-+++ seahorse-2.20.1/intltool-extract.in 2007-10-16 13:22:48.000000000 +0200
+Index: seahorse-2.20.1/intltool-extract.in
+===================================================================
+--- seahorse-2.20.1.orig/intltool-extract.in 2007-11-15 18:59:43.797825729 +0100
++++ seahorse-2.20.1/intltool-extract.in 2007-11-15 19:04:02.044542370 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
@@ -4115,7 +4127,7 @@
## Loaded modules
use strict;
-@@ -237,9 +237,9 @@
+@@ -237,9 +237,9 @@ sub entity_decode
s/'/'/g; # '
s/"/"/g; # "
@@ -4126,9 +4138,10 @@
return $_;
}
-diff -Naur seahorse-2.20.1.old/intltool-merge.in seahorse-2.20.1/intltool-merge.in
---- seahorse-2.20.1.old/intltool-merge.in 2007-10-15 18:15:47.000000000 +0200
-+++ seahorse-2.20.1/intltool-merge.in 2007-10-16 13:22:48.000000000 +0200
+Index: seahorse-2.20.1/intltool-merge.in
+===================================================================
+--- seahorse-2.20.1.orig/intltool-merge.in 2007-11-15 18:59:43.781824817 +0100
++++ seahorse-2.20.1/intltool-merge.in 2007-11-15 19:04:02.048542598 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
@@ -4138,7 +4151,7 @@
## Loaded modules
use strict;
-@@ -93,9 +93,24 @@
+@@ -93,9 +93,24 @@ my $OUTFILE;
my %po_files_by_lang = ();
my %translations = ();
@@ -4164,7 +4177,7 @@
# Use this instead of \w for XML files to handle more possible characters.
my $w = "[-A-Za-z0-9._:]";
-@@ -260,8 +275,42 @@
+@@ -260,8 +275,42 @@ sub po_file2lang
sub gather_po_files
{
@@ -4209,7 +4222,7 @@
}
}
-@@ -494,16 +543,15 @@
+@@ -494,16 +543,15 @@ sub unescape_po_string
return $string;
}
@@ -4228,9 +4241,10 @@
return $_;
}
-diff -Naur seahorse-2.20.1.old/intltool-update.in seahorse-2.20.1/intltool-update.in
---- seahorse-2.20.1.old/intltool-update.in 2007-10-15 18:15:47.000000000 +0200
-+++ seahorse-2.20.1/intltool-update.in 2007-10-16 13:22:48.000000000 +0200
+Index: seahorse-2.20.1/intltool-update.in
+===================================================================
+--- seahorse-2.20.1.orig/intltool-update.in 2007-11-15 18:59:43.741822537 +0100
++++ seahorse-2.20.1/intltool-update.in 2007-11-15 19:04:02.048542598 +0100
@@ -30,7 +30,7 @@
## Release information
@@ -4240,7 +4254,7 @@
my $PACKAGE = "intltool";
## Loaded modules
-@@ -71,7 +71,8 @@
+@@ -71,7 +71,8 @@ my $xml_support =
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
@@ -4250,7 +4264,7 @@
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-@@ -328,7 +329,12 @@
+@@ -328,7 +329,12 @@ sub FindLeftoutFiles
push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
}, "..";
@@ -4264,7 +4278,7 @@
open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
@buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -489,11 +495,15 @@
+@@ -489,11 +495,15 @@ sub FindLeftoutFiles
my %in2;
foreach (@buf_potfiles_sorted)
{
@@ -4280,7 +4294,7 @@
$in2{$_} = 1;
}
-@@ -501,9 +511,16 @@
+@@ -501,9 +511,16 @@ sub FindLeftoutFiles
foreach (@buf_allfiles_sorted)
{
@@ -4299,7 +4313,7 @@
}
}
-@@ -563,11 +580,23 @@
+@@ -563,11 +580,23 @@ sub Console_WriteError_InvalidOption
exit 1;
}
@@ -4325,7 +4339,7 @@
return 0;
}
-@@ -577,7 +606,7 @@
+@@ -577,7 +606,7 @@ sub GenerateHeaders
## Generate the .h header files, so we can allow glade and
## xml translation support
@@ -4334,7 +4348,7 @@
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
-@@ -624,13 +653,13 @@
+@@ -624,13 +653,13 @@ sub GenerateHeaders
#
sub GeneratePOTemplate
{
@@ -4351,7 +4365,7 @@
" *** Without it, intltool-update can not extract strings.\n";
exit;
}
-@@ -726,7 +755,23 @@
+@@ -726,7 +755,23 @@ sub GeneratePOTemplate
unlink "$MODULE.pot";
my @xgettext_argument=("$XGETTEXT",
"--add-comments",
@@ -4376,7 +4390,7 @@
"--output\=$MODULE\.pot",
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-@@ -793,9 +838,16 @@
+@@ -793,9 +838,16 @@ sub POFile_Update
{
-f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
@@ -4394,7 +4408,7 @@
print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
my $infile = "$SRCDIR/$lang.po";
-@@ -836,7 +888,14 @@
+@@ -836,7 +888,14 @@ sub POFile_GetLanguage ($)
sub Console_Write_TranslationStatus
{
my ($lang, $output_file) = @_;
@@ -4410,7 +4424,7 @@
$output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-@@ -845,21 +904,28 @@
+@@ -845,21 +904,28 @@ sub Console_Write_TranslationStatus
sub Console_Write_CoverageReport
{
@@ -4443,7 +4457,7 @@
system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
}
}
-@@ -933,13 +999,13 @@
+@@ -933,13 +999,13 @@ sub CONF_Handle_Open
$conf_in || die "Cannot find top_builddir in Makevars.";
}
@@ -4461,10 +4475,11 @@
}
else
{
-diff -Naur seahorse-2.20.1.old/libcryptui/Makefile.in seahorse-2.20.1/libcryptui/Makefile.in
---- seahorse-2.20.1.old/libcryptui/Makefile.in 2007-10-15 18:16:05.000000000 +0200
-+++ seahorse-2.20.1/libcryptui/Makefile.in 2007-10-16 13:23:04.000000000 +0200
-@@ -174,14 +174,12 @@
+Index: seahorse-2.20.1/libcryptui/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/libcryptui/Makefile.in 2007-11-15 18:59:43.721821397 +0100
++++ seahorse-2.20.1/libcryptui/Makefile.in 2007-11-15 19:06:00.667302296 +0100
+@@ -174,14 +174,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4480,7 +4495,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -193,7 +191,6 @@
+@@ -193,7 +191,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4488,7 +4503,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -243,15 +240,13 @@
+@@ -243,15 +240,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4505,10 +4520,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/libcryptui/tests/Makefile.in seahorse-2.20.1/libcryptui/tests/Makefile.in
---- seahorse-2.20.1.old/libcryptui/tests/Makefile.in 2007-10-15 18:16:05.000000000 +0200
-+++ seahorse-2.20.1/libcryptui/tests/Makefile.in 2007-10-16 13:23:04.000000000 +0200
-@@ -151,14 +151,12 @@
+Index: seahorse-2.20.1/libcryptui/tests/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/libcryptui/tests/Makefile.in 2007-11-15 18:59:43.709820714 +0100
++++ seahorse-2.20.1/libcryptui/tests/Makefile.in 2007-11-15 19:06:00.779308679 +0100
+@@ -151,14 +151,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4524,7 +4540,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -170,7 +168,6 @@
+@@ -170,7 +168,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4532,7 +4548,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -220,15 +217,13 @@
+@@ -220,15 +217,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4549,10 +4565,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/libseahorse/Makefile.in seahorse-2.20.1/libseahorse/Makefile.in
---- seahorse-2.20.1.old/libseahorse/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/libseahorse/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -238,14 +238,12 @@
+Index: seahorse-2.20.1/libseahorse/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/libseahorse/Makefile.in 2007-11-15 18:59:43.657817750 +0100
++++ seahorse-2.20.1/libseahorse/Makefile.in 2007-11-15 19:06:00.939317797 +0100
+@@ -238,14 +238,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -4568,7 +4585,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -257,7 +255,6 @@
+@@ -257,7 +255,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -4576,7 +4593,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -307,15 +304,13 @@
+@@ -307,15 +304,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -4593,9 +4610,10 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/ltmain.sh seahorse-2.20.1/ltmain.sh
---- seahorse-2.20.1.old/ltmain.sh 2006-06-19 20:36:49.000000000 +0200
-+++ seahorse-2.20.1/ltmain.sh 2007-08-14 19:43:36.000000000 +0200
+Index: seahorse-2.20.1/ltmain.sh
+===================================================================
+--- seahorse-2.20.1.orig/ltmain.sh 2007-11-15 18:59:43.641816838 +0100
++++ seahorse-2.20.1/ltmain.sh 2007-11-15 19:04:02.052542826 +0100
@@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -4607,7 +4625,7 @@
# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
-@@ -43,14 +43,22 @@
+@@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
@@ -4635,7 +4653,7 @@
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
-@@ -105,12 +113,14 @@
+@@ -105,12 +113,14 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
@@ -4656,7 +4674,7 @@
# Make sure IFS has a sensible default
lt_nl='
-@@ -136,6 +146,8 @@
+@@ -136,6 +146,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
@@ -4665,7 +4683,7 @@
#####################################
# Shell function definitions:
-@@ -196,7 +208,13 @@
+@@ -196,7 +208,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
@@ -4680,7 +4698,7 @@
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
-@@ -327,7 +345,17 @@
+@@ -327,7 +345,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
@@ -4699,7 +4717,7 @@
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
-@@ -454,11 +482,12 @@
+@@ -454,11 +482,12 @@ do
;;
--version)
@@ -4717,7 +4735,7 @@
exit $?
;;
-@@ -755,9 +784,10 @@
+@@ -755,9 +784,10 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
@@ -4729,7 +4747,7 @@
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -1138,8 +1168,9 @@
+@@ -1138,8 +1168,9 @@ EOF
for arg
do
case $arg in
@@ -4741,7 +4759,7 @@
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
-@@ -1147,12 +1178,20 @@
+@@ -1147,12 +1178,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
@@ -4764,7 +4782,7 @@
build_libtool_libs=no
build_old_libs=yes
break
-@@ -1600,7 +1639,7 @@
+@@ -1600,7 +1639,7 @@ EOF
continue
;;
@@ -4773,7 +4791,7 @@
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
-@@ -1620,10 +1659,11 @@
+@@ -1620,10 +1659,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
@@ -4788,7 +4806,7 @@
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
-@@ -1651,9 +1691,9 @@
+@@ -1651,9 +1691,9 @@ EOF
-no-install)
case $host in
@@ -4800,7 +4818,7 @@
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
-@@ -1712,7 +1752,7 @@
+@@ -1712,7 +1752,7 @@ EOF
continue
;;
@@ -4809,7 +4827,7 @@
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
-@@ -2097,7 +2137,7 @@
+@@ -2097,7 +2137,7 @@ EOF
lib=
found=no
case $deplib in
@@ -4818,7 +4836,7 @@
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
-@@ -2493,7 +2533,9 @@
+@@ -2493,7 +2533,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
@@ -4829,7 +4847,7 @@
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
-@@ -3189,7 +3231,7 @@
+@@ -3189,7 +3231,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
@@ -4838,7 +4856,7 @@
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
-@@ -3200,9 +3242,10 @@
+@@ -3200,9 +3242,10 @@ EOF
age="0"
;;
irix|nonstopux)
@@ -4850,7 +4868,7 @@
;;
*)
$echo "$modename: unknown library version type \`$version_type'" 1>&2
-@@ -3266,7 +3309,8 @@
+@@ -3266,7 +3309,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
@@ -4860,7 +4878,7 @@
;;
freebsd-aout)
-@@ -3280,8 +3324,11 @@
+@@ -3280,8 +3324,11 @@ EOF
;;
irix | nonstopux)
@@ -4874,7 +4892,7 @@
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
-@@ -3418,11 +3465,11 @@
+@@ -3418,11 +3465,11 @@ EOF
fi
# Eliminate all temporary directories.
@@ -4891,7 +4909,7 @@
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
-@@ -3523,13 +3570,12 @@
+@@ -3523,13 +3570,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
@@ -4907,7 +4925,7 @@
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
-@@ -3568,9 +3614,7 @@
+@@ -3568,9 +3614,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
@@ -4918,7 +4936,7 @@
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
-@@ -3602,7 +3646,7 @@
+@@ -3602,7 +3646,7 @@ EOF
droppeddeps=yes
$echo
$echo "*** Warning! Library $i is needed by this library but I was not able to"
@@ -4927,7 +4945,7 @@
$echo "*** library that it depends on before this library will be fully"
$echo "*** functional. Installing it before continuing would be even better."
fi
-@@ -3888,7 +3932,10 @@
+@@ -3888,7 +3932,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
@@ -4939,7 +4957,7 @@
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
-@@ -4247,12 +4294,14 @@
+@@ -4247,12 +4294,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
@@ -4956,7 +4974,7 @@
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
-@@ -4700,16 +4749,16 @@
+@@ -4700,16 +4749,16 @@ static const void *lt_preloaded_setup()
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
@@ -4979,7 +4997,7 @@
;;
esac
;;
-@@ -4724,13 +4773,13 @@
+@@ -4724,13 +4773,13 @@ static const void *lt_preloaded_setup()
# really was required.
# Nullify the symbol file.
@@ -4996,7 +5014,7 @@
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
-@@ -4817,7 +4866,7 @@
+@@ -4817,7 +4866,7 @@ static const void *lt_preloaded_setup()
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
@@ -5005,7 +5023,7 @@
else
# fast_install is set to needless
relink_command=
-@@ -4854,7 +4903,7 @@
+@@ -4854,7 +4903,7 @@ static const void *lt_preloaded_setup()
fi
done
relink_command="(cd `pwd`; $relink_command)"
@@ -5014,7 +5032,7 @@
fi
# Quote $echo for shipping.
-@@ -5261,6 +5310,20 @@
+@@ -5261,6 +5310,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
@@ -5035,7 +5053,7 @@
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-@@ -5403,7 +5466,7 @@
+@@ -5403,7 +5466,7 @@ else
;;
esac
$echo >> $output "\
@@ -5044,7 +5062,7 @@
exit $EXIT_FAILURE
fi
else
-@@ -5589,7 +5652,7 @@
+@@ -5589,7 +5652,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
@@ -5053,7 +5071,7 @@
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
-@@ -5934,9 +5997,9 @@
+@@ -5934,9 +5997,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -5065,7 +5083,7 @@
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -6145,7 +6208,7 @@
+@@ -6145,7 +6208,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
@@ -5074,7 +5092,7 @@
$show "$relink_command"
if $run eval "$relink_command"; then :
-@@ -6356,8 +6419,10 @@
+@@ -6356,8 +6419,10 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
@@ -5087,7 +5105,7 @@
fi
;;
-@@ -6421,12 +6486,12 @@
+@@ -6421,12 +6486,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
@@ -5106,7 +5124,7 @@
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
-@@ -6783,9 +6848,9 @@
+@@ -6783,9 +6848,9 @@ The following components of LINK-COMMAND
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -5118,7 +5136,7 @@
-LLIBDIR search LIBDIR for required installed libraries
-lNAME OUTPUT-FILE requires the installed library libNAME
-module build a library that can dlopened
-@@ -6799,9 +6864,11 @@
+@@ -6799,9 +6864,11 @@ The following components of LINK-COMMAND
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
@@ -5132,9 +5150,10 @@
All other options (arguments beginning with \`-') are ignored.
-diff -Naur seahorse-2.20.1.old/m4/intltool.m4 seahorse-2.20.1/m4/intltool.m4
---- seahorse-2.20.1.old/m4/intltool.m4 2007-10-15 18:15:47.000000000 +0200
-+++ seahorse-2.20.1/m4/intltool.m4 2007-10-16 13:22:48.000000000 +0200
+Index: seahorse-2.20.1/m4/intltool.m4
+===================================================================
+--- seahorse-2.20.1.orig/m4/intltool.m4 2007-11-15 18:59:43.565812507 +0100
++++ seahorse-2.20.1/m4/intltool.m4 2007-11-15 19:04:02.052542826 +0100
@@ -23,7 +23,7 @@
## the same distribution terms that you use for the rest of that program.
@@ -5144,7 +5163,7 @@
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ case "$am__api_version" in
esac
if test -n "$1"; then
@@ -5153,7 +5172,7 @@
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-@@ -65,6 +65,7 @@
+@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -5161,7 +5180,7 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -84,6 +85,7 @@
+@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
@@ -5169,7 +5188,7 @@
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -106,19 +108,16 @@
+@@ -106,19 +108,16 @@ if test "x$2" != "xno-xml"; then
fi
fi
@@ -5193,7 +5212,7 @@
[DATADIRNAME=share],
[case $host in
*-*-solaris*)
-@@ -159,10 +158,6 @@
+@@ -159,10 +158,6 @@ AC_CONFIG_COMMANDS([intltool], [
for file in intltool-extract intltool-merge intltool-update; do
sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
@@ -5204,7 +5223,7 @@
-e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
< ${ac_aux_dir}/${file}.in > ${file}.out
if cmp -s ${file} ${file}.out 2>/dev/null; then
-@@ -177,9 +172,7 @@
+@@ -177,9 +172,7 @@ done
],
[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
@@ -5215,10 +5234,11 @@
])
-diff -Naur seahorse-2.20.1.old/Makefile.in seahorse-2.20.1/Makefile.in
---- seahorse-2.20.1.old/Makefile.in 2007-10-15 18:16:08.000000000 +0200
-+++ seahorse-2.20.1/Makefile.in 2007-10-16 13:23:07.000000000 +0200
-@@ -152,14 +152,12 @@
+Index: seahorse-2.20.1/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/Makefile.in 2007-11-15 18:59:43.545811367 +0100
++++ seahorse-2.20.1/Makefile.in 2007-11-15 19:06:02.711418784 +0100
+@@ -152,14 +152,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5234,7 +5254,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -171,7 +169,6 @@
+@@ -171,7 +169,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5242,7 +5262,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -221,15 +218,13 @@
+@@ -221,15 +218,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5259,10 +5279,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/pixmaps/22x22/Makefile.in seahorse-2.20.1/pixmaps/22x22/Makefile.in
---- seahorse-2.20.1.old/pixmaps/22x22/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/pixmaps/22x22/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -134,14 +134,12 @@
+Index: seahorse-2.20.1/pixmaps/22x22/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/pixmaps/22x22/Makefile.in 2007-11-15 18:59:43.533810683 +0100
++++ seahorse-2.20.1/pixmaps/22x22/Makefile.in 2007-11-15 19:06:01.039323496 +0100
+@@ -134,14 +134,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5278,7 +5299,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -153,7 +151,6 @@
+@@ -153,7 +151,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5286,7 +5307,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -203,15 +200,13 @@
+@@ -203,15 +200,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5303,10 +5324,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/pixmaps/48x48/Makefile.in seahorse-2.20.1/pixmaps/48x48/Makefile.in
---- seahorse-2.20.1.old/pixmaps/48x48/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/pixmaps/48x48/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -135,14 +135,12 @@
+Index: seahorse-2.20.1/pixmaps/48x48/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/pixmaps/48x48/Makefile.in 2007-11-15 18:59:43.457806352 +0100
++++ seahorse-2.20.1/pixmaps/48x48/Makefile.in 2007-11-15 19:06:01.135328968 +0100
+@@ -135,14 +135,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5322,7 +5344,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +152,6 @@
+@@ -154,7 +152,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5330,7 +5352,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -204,15 +201,13 @@
+@@ -204,15 +201,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5347,10 +5369,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/pixmaps/Makefile.in seahorse-2.20.1/pixmaps/Makefile.in
---- seahorse-2.20.1.old/pixmaps/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/pixmaps/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -134,14 +134,12 @@
+Index: seahorse-2.20.1/pixmaps/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/pixmaps/Makefile.in 2007-11-15 18:59:43.437805212 +0100
++++ seahorse-2.20.1/pixmaps/Makefile.in 2007-11-15 19:06:01.231334439 +0100
+@@ -134,14 +134,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5366,7 +5389,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -153,7 +151,6 @@
+@@ -153,7 +151,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5374,7 +5397,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -203,15 +200,13 @@
+@@ -203,15 +200,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5391,10 +5414,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/pixmaps/scalable/Makefile.in seahorse-2.20.1/pixmaps/scalable/Makefile.in
---- seahorse-2.20.1.old/pixmaps/scalable/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/pixmaps/scalable/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -135,14 +135,12 @@
+Index: seahorse-2.20.1/pixmaps/scalable/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/pixmaps/scalable/Makefile.in 2007-11-15 18:59:43.421804300 +0100
++++ seahorse-2.20.1/pixmaps/scalable/Makefile.in 2007-11-15 19:06:01.331340138 +0100
+@@ -135,14 +135,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5410,7 +5434,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -154,7 +152,6 @@
+@@ -154,7 +152,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5418,7 +5442,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -204,15 +201,13 @@
+@@ -204,15 +201,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5435,10 +5459,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/applet/docs/Makefile.in seahorse-2.20.1/plugins/applet/docs/Makefile.in
---- seahorse-2.20.1.old/plugins/applet/docs/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/plugins/applet/docs/Makefile.in 2007-10-16 13:23:06.000000000 +0200
-@@ -147,14 +147,12 @@
+Index: seahorse-2.20.1/plugins/applet/docs/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/applet/docs/Makefile.in 2007-11-15 18:59:43.373801565 +0100
++++ seahorse-2.20.1/plugins/applet/docs/Makefile.in 2007-11-15 19:06:01.735363162 +0100
+@@ -147,14 +147,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5454,7 +5479,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -166,7 +164,6 @@
+@@ -166,7 +164,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5462,7 +5487,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -216,15 +213,13 @@
+@@ -216,15 +213,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5479,7 +5504,7 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-@@ -772,6 +767,11 @@
+@@ -772,6 +767,11 @@ dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES)'; \
for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -5491,7 +5516,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \
$(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \
done
-@@ -840,6 +840,12 @@
+@@ -840,6 +840,12 @@ install-doc-docs:
done
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
@@ -5504,7 +5529,7 @@
echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
done
-@@ -907,7 +913,7 @@
+@@ -907,7 +913,7 @@ uninstall-doc-figs:
uninstall-doc-omf:
@list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
@@ -5513,10 +5538,11 @@
echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
fi; \
-diff -Naur seahorse-2.20.1.old/plugins/applet/Makefile.in seahorse-2.20.1/plugins/applet/Makefile.in
---- seahorse-2.20.1.old/plugins/applet/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/plugins/applet/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -170,14 +170,12 @@
+Index: seahorse-2.20.1/plugins/applet/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/applet/Makefile.in 2007-11-15 18:59:43.349800197 +0100
++++ seahorse-2.20.1/plugins/applet/Makefile.in 2007-11-15 19:06:01.563353359 +0100
+@@ -170,14 +170,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5532,7 +5558,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -189,7 +187,6 @@
+@@ -189,7 +187,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5540,7 +5566,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -239,15 +236,13 @@
+@@ -239,15 +236,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5557,10 +5583,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/epiphany/Makefile.in seahorse-2.20.1/plugins/epiphany/Makefile.in
---- seahorse-2.20.1.old/plugins/epiphany/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/plugins/epiphany/Makefile.in 2007-10-16 13:23:06.000000000 +0200
-@@ -172,14 +172,12 @@
+Index: seahorse-2.20.1/plugins/epiphany/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/epiphany/Makefile.in 2007-11-15 18:59:43.277796094 +0100
++++ seahorse-2.20.1/plugins/epiphany/Makefile.in 2007-11-15 19:06:01.907372964 +0100
+@@ -172,14 +172,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5576,7 +5603,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -191,7 +189,6 @@
+@@ -191,7 +189,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5584,7 +5611,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -241,15 +238,13 @@
+@@ -241,15 +238,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5601,10 +5628,20 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/epiphany/mozilla/Makefile.in seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in
---- seahorse-2.20.1.old/plugins/epiphany/mozilla/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in 2007-10-16 13:23:06.000000000 +0200
-@@ -154,14 +154,12 @@
+@@ -306,7 +301,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = mozilla
+-extensiondir = $(libdir)/epiphany/$(E_API_VERSION)/extensions
++extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
+ extension_LTLIBRARIES = libseahorseextension.la
+ libseahorseextension_la_SOURCES = \
+ ephy-debug.h \
+Index: seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/epiphany/mozilla/Makefile.in 2007-11-15 18:59:43.257794954 +0100
++++ seahorse-2.20.1/plugins/epiphany/mozilla/Makefile.in 2007-11-15 19:06:02.059381626 +0100
+@@ -154,14 +154,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5620,7 +5657,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -173,7 +171,6 @@
+@@ -173,7 +171,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5628,7 +5665,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -223,15 +220,13 @@
+@@ -223,15 +220,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5645,10 +5682,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/gedit/Makefile.in seahorse-2.20.1/plugins/gedit/Makefile.in
---- seahorse-2.20.1.old/plugins/gedit/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/plugins/gedit/Makefile.in 2007-10-16 13:23:06.000000000 +0200
-@@ -164,14 +164,12 @@
+Index: seahorse-2.20.1/plugins/gedit/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/gedit/Makefile.in 2007-11-15 18:59:43.209792219 +0100
++++ seahorse-2.20.1/plugins/gedit/Makefile.in 2007-11-15 19:06:02.223390973 +0100
+@@ -164,14 +164,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5664,7 +5702,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -183,7 +181,6 @@
+@@ -183,7 +181,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5672,7 +5710,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -233,15 +230,13 @@
+@@ -233,15 +230,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5689,10 +5727,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/Makefile.in seahorse-2.20.1/plugins/Makefile.in
---- seahorse-2.20.1.old/plugins/Makefile.in 2007-10-15 18:16:06.000000000 +0200
-+++ seahorse-2.20.1/plugins/Makefile.in 2007-10-16 13:23:05.000000000 +0200
-@@ -134,14 +134,12 @@
+Index: seahorse-2.20.1/plugins/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/Makefile.in 2007-11-15 18:59:43.193791307 +0100
++++ seahorse-2.20.1/plugins/Makefile.in 2007-11-15 19:06:01.435346065 +0100
+@@ -134,14 +134,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5708,7 +5747,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -153,7 +151,6 @@
+@@ -153,7 +151,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5716,7 +5755,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -203,15 +200,13 @@
+@@ -203,15 +200,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5733,10 +5772,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/nautilus/Makefile.in seahorse-2.20.1/plugins/nautilus/Makefile.in
---- seahorse-2.20.1.old/plugins/nautilus/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/plugins/nautilus/Makefile.in 2007-10-16 13:23:06.000000000 +0200
-@@ -169,14 +169,12 @@
+Index: seahorse-2.20.1/plugins/nautilus/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/nautilus/Makefile.in 2007-11-15 18:59:43.177790395 +0100
++++ seahorse-2.20.1/plugins/nautilus/Makefile.in 2007-11-15 19:06:02.467404878 +0100
+@@ -169,14 +169,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5752,7 +5792,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -188,7 +186,6 @@
+@@ -188,7 +186,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5760,7 +5800,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -238,15 +235,13 @@
+@@ -238,15 +235,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5777,10 +5817,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/plugins/nautilus-ext/Makefile.in seahorse-2.20.1/plugins/nautilus-ext/Makefile.in
---- seahorse-2.20.1.old/plugins/nautilus-ext/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/plugins/nautilus-ext/Makefile.in 2007-10-16 13:23:06.000000000 +0200
-@@ -155,14 +155,12 @@
+Index: seahorse-2.20.1/plugins/nautilus-ext/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/plugins/nautilus-ext/Makefile.in 2007-11-15 18:59:43.097785836 +0100
++++ seahorse-2.20.1/plugins/nautilus-ext/Makefile.in 2007-11-15 19:06:02.335397356 +0100
+@@ -155,14 +155,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5796,7 +5837,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -174,7 +172,6 @@
+@@ -174,7 +172,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5804,7 +5845,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -224,15 +221,13 @@
+@@ -224,15 +221,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
@@ -5821,10 +5862,11 @@
STRIP = @STRIP@
USE_NLS = @USE_NLS@
VERSION = @VERSION@
-diff -Naur seahorse-2.20.1.old/po/Makefile.in.in seahorse-2.20.1/po/Makefile.in.in
---- seahorse-2.20.1.old/po/Makefile.in.in 2007-10-15 18:15:47.000000000 +0200
-+++ seahorse-2.20.1/po/Makefile.in.in 2007-10-16 13:22:48.000000000 +0200
-@@ -133,7 +133,7 @@
+Index: seahorse-2.20.1/po/Makefile.in.in
+===================================================================
+--- seahorse-2.20.1.orig/po/Makefile.in.in 2007-11-15 18:59:43.077784696 +0100
++++ seahorse-2.20.1/po/Makefile.in.in 2007-11-15 19:04:02.060543282 +0100
+@@ -133,7 +133,7 @@ install-data-yes: all
dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
@@ -5833,10 +5875,11 @@
uninstall:
linguas="$(USE_LINGUAS)"; \
-diff -Naur seahorse-2.20.1.old/src/Makefile.in seahorse-2.20.1/src/Makefile.in
---- seahorse-2.20.1.old/src/Makefile.in 2007-10-15 18:16:07.000000000 +0200
-+++ seahorse-2.20.1/src/Makefile.in 2007-10-16 13:23:07.000000000 +0200
-@@ -202,14 +202,12 @@
+Index: seahorse-2.20.1/src/Makefile.in
+===================================================================
+--- seahorse-2.20.1.orig/src/Makefile.in 2007-11-15 18:59:43.065784012 +0100
++++ seahorse-2.20.1/src/Makefile.in 2007-11-15 19:06:02.603412629 +0100
+@@ -202,14 +202,12 @@ INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RU
INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
@@ -5852,7 +5895,7 @@
INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-@@ -221,7 +219,6 @@
+@@ -221,7 +219,6 @@ INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RU
INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
@@ -5860,7 +5903,7 @@
INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
LDFLAGS = @LDFLAGS@
-@@ -271,15 +268,13 @@
+@@ -271,15 +268,13 @@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE
RANLIB = @RANLIB@
SEAHORSE_CFLAGS = @SEAHORSE_CFLAGS@
SEAHORSE_LIBS = @SEAHORSE_LIBS@
Copied: desktop/unstable/seahorse/debian/patches/series (from r13455, desktop/unstable/seahorse/debian/patches/00list)
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/series?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/00list (original)
+++ desktop/unstable/seahorse/debian/patches/series Thu Nov 15 18:51:24 2007
@@ -1,3 +1,4 @@
-2_mlock.dpatch
-8_force_ssh.dpatch
-10_relibtoolize.dpatch
+01_epiphany-path.patch
+02_mlock.patch
+08_force_ssh.patch
+10_relibtoolize.patch
Modified: desktop/unstable/seahorse/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/rules?rev=13456&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/rules (original)
+++ desktop/unstable/seahorse/debian/rules Thu Nov 15 18:51:24 2007
@@ -1,85 +1,19 @@
#!/usr/bin/make -f
-# C compiler information
-CC = gcc
-CFLAGS = -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
-LDFLAGS = -Wl,-O1
-
-export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-confflags += --prefix=/usr \
- --sysconfdir=/etc \
- --disable-update-mime-database \
- --disable-schemas-install \
- --disable-scrollkeeper
-
-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
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-# 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: autotools-stamp
-autotools-stamp:
- -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 $@
+LDFLAGS += -Wl,-O1 -Wl,--as-needed
-configure: configure-stamp
-configure-stamp: autotools-stamp patch-stamp
- dh_testdir
- CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
- ./configure $(confflags)
- touch $@
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mime-database \
+ --disable-schemas-install \
+ --disable-scrollkeeper
-build: build-stamp
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-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
+binary-post-install/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
@@ -90,31 +24,3 @@
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: autotools configure build install clean binary-indep binary-arch binary
Added: desktop/unstable/seahorse/debian/seahorse.xpm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/seahorse.xpm?rev=13456&op=file
==============================================================================
--- desktop/unstable/seahorse/debian/seahorse.xpm (added)
+++ desktop/unstable/seahorse/debian/seahorse.xpm Thu Nov 15 18:51:24 2007
@@ -1,0 +1,222 @@
+/* XPM */
+static char *seahorse[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 184 2",
+" c black",
+". c #3D3D3D",
+"X c #2C344E",
+"o c #743700",
+"O c #5B4900",
+"+ c #614713",
+"@ c #6F581D",
+"# c #756324",
+"$ c #7A6625",
+"% c #796B26",
+"& c #7E6A2B",
+"* c #7D702E",
+"= c #7F7035",
+"- c #4C4C4C",
+"; c #555555",
+": c #55565C",
+"> c #5C5C5C",
+", c #626054",
+"< c #716744",
+"1 c #776D43",
+"2 c #746B49",
+"3 c #7B6F43",
+"4 c #636363",
+"5 c #6B6B6B",
+"6 c #7B7667",
+"7 c #737272",
+"8 c #797876",
+"9 c #7B7B7B",
+"0 c #8E6500",
+"q c #8A711D",
+"w c #906300",
+"e c #926A00",
+"r c #9A7500",
+"t c #9A7C00",
+"y c #9E7E09",
+"u c #977E1E",
+"i c #856C2E",
+"p c #826B30",
+"a c #8B6B39",
+"s c #8B762E",
+"d c #8D7A2A",
+"f c #847333",
+"g c #867836",
+"h c #887635",
+"j c #8C7C3B",
+"k c #937B20",
+"l c #A27E00",
+"z c #907F40",
+"x c #817A60",
+"c c #9D800D",
+"v c #9E8216",
+"b c #9E8219",
+"n c #9B842D",
+"m c #90803E",
+"M c #9E8B3D",
+"N c #A58304",
+"B c #A3840D",
+"V c #A58C07",
+"C c #A98405",
+"Z c #A98509",
+"A c #AC8B0C",
+"S c #A28513",
+"D c #AC8C12",
+"F c #AA8E1F",
+"G c #AD9816",
+"H c #B08D0D",
+"J c #B18D10",
+"K c #B2910F",
+"L c #B9970D",
+"P c #B39212",
+"I c #B79817",
+"U c #B7991B",
+"Y c #BE9D14",
+"T c #BA9B1A",
+"R c #A78B20",
+"E c #AA8F21",
+"W c #B19627",
+"Q c #BB9E22",
+"! c #B09B3D",
+"~ c #AAAA00",
+"^ c #BFA020",
+"/ c #B9A032",
+"( c #928341",
+") c #91834A",
+"_ c #9E8C42",
+"` c #9A8B4A",
+"' c #91875A",
+"] c #968A5B",
+"[ c #87816C",
+"{ c #868271",
+"} c #87857A",
+"| c #908967",
+" . c #948B6B",
+".. c #9E9571",
+"X. c #A49241",
+"o. c #A99541",
+"O. c #AD9A4D",
+"+. c #A29352",
+"@. c #A0945C",
+"#. c #A79954",
+"$. c #AB9D56",
+"%. c #A99B59",
+"&. c #B09E4E",
+"*. c #B4905E",
+"=. c #A19561",
+"-. c #A69B62",
+";. c #A0997B",
+":. c #AEA05C",
+">. c #B3A45B",
+",. c #AEA162",
+"<. c #AFA36A",
+"1. c #B3A663",
+"2. c #B6A965",
+"3. c #B7A969",
+"4. c #BBAE67",
+"5. c #BAAD6A",
+"6. c #BDB16C",
+"7. c #C09F18",
+"8. c #C3992A",
+"9. c #C5A312",
+"0. c #C3A41C",
+"q. c #C9A615",
+"w. c #CAA61D",
+"e. c #CCAA1C",
+"r. c #C3A521",
+"t. c #C6AA25",
+"y. c #C6A929",
+"u. c #CDAD23",
+"i. c #CAAD2B",
+"p. c #C6AB32",
+"a. c #C3AB3B",
+"s. c #CAAF32",
+"d. c #C8AF39",
+"f. c #CFB025",
+"g. c #CFB12B",
+"h. c #CCB133",
+"j. c #CCB33E",
+"k. c #D0B126",
+"l. c #D2B32B",
+"z. c #D4B92C",
+"x. c #D3B633",
+"c. c #D6B934",
+"v. c #D5BA3A",
+"b. c #D9BC36",
+"n. c #D9BE3A",
+"m. c #C3AB41",
+"M. c #C0AC4D",
+"N. c #CFB640",
+"B. c #C3B055",
+"V. c #D5BD45",
+"C. c #C1B66E",
+"Z. c #C4BA71",
+"A. c #C7BC7A",
+"S. c #C8BB74",
+"D. c #DBC032",
+"F. c #DBC13D",
+"G. c #E0C63F",
+"H. c #E3CA3C",
+"J. c #DDC443",
+"K. c #DDC54B",
+"L. c #E0C646",
+"P. c #E3CA43",
+"I. c #E2CA4C",
+"U. c #E4CE54",
+"Y. c #E9D242",
+"T. c #EBD44A",
+"R. c #EFD948",
+"E. c #E7D157",
+"W. c #E6D25B",
+"Q. c #E9D45C",
+"!. c #EBD760",
+"~. c #EDDA66",
+"^. c #EFDD6A",
+"/. c #F0DE6B",
+"(. c #838383",
+"). c #888783",
+"_. c #8C8C8C",
+"`. c #9C9786",
+"'. c #929292",
+"]. c #9B9B9B",
+"[. c #A59F8A",
+"{. c #A2A2A3",
+"}. c #ABA9A2",
+"|. c None",
+/* pixels */
+"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.; ; 4 4 4 4 > ; (.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.; 4 8 _.{.{.].9 4 > |.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.: 4 (.`.......[.}.].5 > |.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.X > 6 ] _ O.>.5.<.-.;.'.5 - |.|.|.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.: 2 n W p.d.h.a.B.A.-. .8 4 4 4 4 4 4 4 4 4 4 4 4 4 > > |.",
+"|.|.|.d E i.F.J.K.U.U.V.a.S.-.[ (.(.).).)._.(.(.(.(.(.(.(.9 4 : ",
+"|.|.A I i.c.u.T T V.Q.~.U.m.C.' (._._.'.'._._.'._.'._.'.'._.5 > ",
+"|.C P w.e.I S N B Q U.Q.^.K.>. at .} _._._._._._._.9 ).(.(._.).5 > ",
+"|.D Y w.Y u < = v T I.Q.~.~.d.+.{ _.(._.].].].).5 (.9 5 ).8 > : ",
+"|.P 0.e.Y b f u I c.I.E.~.^.j.M x 7 4 7 (.(.(.5 5 5 5 4 4 > - |.",
+"|.K e.q.9.L L 9.u.b.J.E.!.~.j.! ) 3 1 > : > > 4 4 4 > ; . |.|.",
+"|.P r.e.e.q.q.e.u.l.c.J.Q.~.h.&.2.$.( h q |.|.|.|.|.|.|.|.|.|.|.",
+"|.K w.e.e.e.e.e.u.l.x.b.I.Q.! >.1.6.>.+.j f $ |.|.|.|.|.|.|.|.|.",
+"|.A T u.e.e.u.u.k.l.z.c.n.s.o.2.2.1.4.6.1.` h f |.|.|.|.|.|.|.|.",
+"|.N P r.k.k.k.k.l.l.c.b.n.Q o.#.$.6.1.1.5.5.%.( h % |.|.|.|.|.|.",
+"|.|.C P r.l.l.l.z.x.c.F.F.g.F j ` Z.C.4.1.3.5.2.+.j p $ |.|.|.|.",
+"|.|.|.A P T r.t.t.x.b.F.F.H.0.S m #.6.Z.5.#.-.5.4.-.` j f |.|.|.",
+"|.|.|.|.C N A P P T D.H.F.H.D.I q g ( #.+.j 2.-.1.3.3.` f |.|.|.",
+"|.|.|.|.|.|.|.|.A K 9.z.F.F.H.t.A |.p f m m 1.` %.2.3.` f |.|.|.",
+"|.|.|.|.|.|.|.|.|.r K z.Y.F.F.F.I Z |.|.|.h h z %.,.+.m i |.|.|.",
+"|.|.|.|.|.|.|.|.|.O J z.R.P.F.P.g.A |.|.|.p i j j m f f g |.|.|.",
+"|.|.|.|.|.|.|.|.|.|.C T P.T.F.J.F.T N |.|.|.|.i $ # + |.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.A t.P.n.v.J.h.P |.|.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.N K P T i.J.J.T A |.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.c T y.J.n.L.h.P r |.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.|.P ^ i.i.F.J.r.A |.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.|.A A P v.F.J.h.A |.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.|.|.w P s.v.x.^ A |.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.A D T T A t |.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.0 l N A |.|.|.|.|.|.|.|.|.|.|.|.",
+"|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|.|."
+};
More information about the pkg-gnome-commits
mailing list