r20051 - in /desktop/unstable/seahorse/debian: changelog control control.in libcryptui-dev.install patches/90_autoconf.patch seahorse.install
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Wed May 20 12:03:43 UTC 2009
Author: joss
Date: Wed May 20 12:03:42 2009
New Revision: 20051
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20051
Log:
* New upstream release.
+ Builds with newer gnome-keyring. Closes: #527658.
+ Refactored code with greatly improved speed. Closes: #395814.
+ Starts the daemon with the session if needed. Closes: #438652.
+ Removes temporary directories after exiting. Closes: #505648.
+ Correctly implements SSH key refreshing. Closes: #508332.
* Update build-dependencies.
* Add missing dependencies in the -dev package.
* 90_autoconf.patch: regenerated for the new version.
* Install the autostart file in /usr/share/gnome/autostart.
* Install API documentation in libcryptui-dev.
Modified:
desktop/unstable/seahorse/debian/changelog
desktop/unstable/seahorse/debian/control
desktop/unstable/seahorse/debian/control.in
desktop/unstable/seahorse/debian/libcryptui-dev.install
desktop/unstable/seahorse/debian/patches/90_autoconf.patch
desktop/unstable/seahorse/debian/seahorse.install
Modified: desktop/unstable/seahorse/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/changelog?rev=20051&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/changelog (original)
+++ desktop/unstable/seahorse/debian/changelog Wed May 20 12:03:42 2009
@@ -1,3 +1,19 @@
+seahorse (2.26.1-1) unstable; urgency=low
+
+ * New upstream release.
+ + Builds with newer gnome-keyring. Closes: #527658.
+ + Refactored code with greatly improved speed. Closes: #395814.
+ + Starts the daemon with the session if needed. Closes: #438652.
+ + Removes temporary directories after exiting. Closes: #505648.
+ + Correctly implements SSH key refreshing. Closes: #508332.
+ * Update build-dependencies.
+ * Add missing dependencies in the -dev package.
+ * 90_autoconf.patch: regenerated for the new version.
+ * Install the autostart file in /usr/share/gnome/autostart.
+ * Install API documentation in libcryptui-dev.
+
+ -- Josselin Mouette <joss at debian.org> Wed, 20 May 2009 13:34:28 +0200
+
seahorse (2.24.1-2) unstable; urgency=low
* Upload to unstable.
Modified: desktop/unstable/seahorse/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control?rev=20051&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control (original)
+++ desktop/unstable/seahorse/debian/control Wed May 20 12:03:42 2009
@@ -2,14 +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>, Emilio Pozuelo Monfort <pochu at ubuntu.com>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>= 5),
cdbs (>= 0.4.41),
quilt,
libglade2-dev,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
- libgp11-dev (>= 2.23.6),
+ libgp11-dev (>= 2.25.5),
+ libgcr-dev (>= 2.25.5),
intltool (>= 0.35),
libsoup2.4-dev,
libldap2-dev,
@@ -18,14 +19,15 @@
libavahi-client-dev (>= 0.6),
libdbus-glib-1-dev,
gnome-doc-utils,
- libgnome-keyring-dev,
+ gtk-doc-tools (>= 1.9),
+ libgnome-keyring-dev (>= 2.25.5),
libglib2.0-dev (>= 2.10.0),
libgtk2.0-dev (>= 2.10.0),
libxml2-dev (>= 2.6.0),
libgconf2-dev,
gnome-pkg-tools
Build-Conflicts: gnupg2
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Package: seahorse
Architecture: any
@@ -60,6 +62,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ libglib2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.10.0),
+ libgconf2-dev,
libcryptui0 (= ${binary:Version})
Section: libdevel
Description: the UI library for DBUS functions exported by seahorse (development)
Modified: desktop/unstable/seahorse/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/control.in?rev=20051&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/control.in (original)
+++ desktop/unstable/seahorse/debian/control.in Wed May 20 12:03:42 2009
@@ -9,7 +9,8 @@
libglade2-dev,
scrollkeeper,
libgpgme11-dev (>= 1.0.0),
- libgp11-dev (>= 2.23.6),
+ libgp11-dev (>= 2.25.5),
+ libgcr-dev (>= 2.25.5),
intltool (>= 0.35),
libsoup2.4-dev,
libldap2-dev,
@@ -18,14 +19,15 @@
libavahi-client-dev (>= 0.6),
libdbus-glib-1-dev,
gnome-doc-utils,
- libgnome-keyring-dev,
+ gtk-doc-tools (>= 1.9),
+ libgnome-keyring-dev (>= 2.25.5),
libglib2.0-dev (>= 2.10.0),
libgtk2.0-dev (>= 2.10.0),
libxml2-dev (>= 2.6.0),
libgconf2-dev,
gnome-pkg-tools
Build-Conflicts: gnupg2
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Package: seahorse
Architecture: any
@@ -60,6 +62,9 @@
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
+ libglib2.0-dev (>= 2.10.0),
+ libgtk2.0-dev (>= 2.10.0),
+ libgconf2-dev,
libcryptui0 (= ${binary:Version})
Section: libdevel
Description: the UI library for DBUS functions exported by seahorse (development)
Modified: desktop/unstable/seahorse/debian/libcryptui-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/libcryptui-dev.install?rev=20051&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/libcryptui-dev.install (original)
+++ desktop/unstable/seahorse/debian/libcryptui-dev.install Wed May 20 12:03:42 2009
@@ -1,3 +1,4 @@
debian/tmp/usr/include
debian/tmp/usr/lib/*.so
debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/share/gtk-doc
Modified: desktop/unstable/seahorse/debian/patches/90_autoconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/patches/90_autoconf.patch?rev=20051&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/patches/90_autoconf.patch (original)
+++ desktop/unstable/seahorse/debian/patches/90_autoconf.patch Wed May 20 12:03:42 2009
@@ -1,167 +1,168 @@
-diff -ruNp seahorse-2.24.1.orig/configure seahorse-2.24.1/configure
---- seahorse-2.24.1.orig/configure 2008-10-19 11:23:53.000000000 +0200
-+++ seahorse-2.24.1/configure 2008-11-25 10:58:59.000000000 +0100
-@@ -961,8 +961,6 @@ GP11_CFLAGS
+Index: seahorse-2.26.1/configure
+===================================================================
+--- seahorse-2.26.1.orig/configure 2009-04-12 16:33:21.000000000 +0200
++++ seahorse-2.26.1/configure 2009-05-20 13:43:11.850833445 +0200
+@@ -818,8 +818,6 @@ WITH_TESTS_FALSE
+ WITH_TESTS_TRUE
+ WITH_SSH_FALSE
+ WITH_SSH_TRUE
+-SSH_PATH
+-SSH_KEYGEN_PATH
+ WITH_PKCS11_FALSE
+ WITH_PKCS11_TRUE
GP11_LIBS
- WITH_PKCS11_TRUE
- WITH_PKCS11_FALSE
--SSH_KEYGEN_PATH
--SSH_PATH
- WITH_SSH_TRUE
- WITH_SSH_FALSE
- WITH_TESTS_TRUE
-@@ -5549,13 +5547,13 @@ if test "${lt_cv_nm_interface+set}" = se
+@@ -5759,13 +5757,13 @@ if test "${lt_cv_nm_interface+set}" = se
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:5552: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:5550: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:5762: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:5760: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5555: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:5553: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:5765: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:5763: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:5558: output\"" >&5)
-+ (eval echo "\"\$as_me:5556: output\"" >&5)
+- (eval echo "\"\$as_me:5768: output\"" >&5)
++ (eval echo "\"\$as_me:5766: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
-@@ -6665,7 +6663,7 @@ ia64-*-hpux*)
+@@ -6970,7 +6968,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 6668 "configure"' > conftest.$ac_ext
-+ echo '#line 6666 "configure"' > conftest.$ac_ext
+- echo '#line 6973 "configure"' > conftest.$ac_ext
++ echo '#line 6971 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
-@@ -9221,11 +9219,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9224: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9222: $lt_compile\"" >&5)
+@@ -9546,11 +9544,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9549: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9547: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9228: \$? = $ac_status" >&5
-+ echo "$as_me:9226: \$? = $ac_status" >&5
+- echo "$as_me:9553: \$? = $ac_status" >&5
++ echo "$as_me:9551: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9545,11 +9543,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9548: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9546: $lt_compile\"" >&5)
+@@ -9885,11 +9883,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9888: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9886: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:9552: \$? = $ac_status" >&5
-+ echo "$as_me:9550: \$? = $ac_status" >&5
+- echo "$as_me:9892: \$? = $ac_status" >&5
++ echo "$as_me:9890: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -9650,11 +9648,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9653: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9651: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9657: \$? = $ac_status" >&5
-+ echo "$as_me:9655: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -9705,11 +9703,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:9708: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:9706: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:9712: \$? = $ac_status" >&5
-+ echo "$as_me:9710: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -12466,7 +12464,7 @@ else
+@@ -9990,11 +9988,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9993: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9991: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9997: \$? = $ac_status" >&5
++ echo "$as_me:9995: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -10045,11 +10043,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:10048: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10046: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10052: \$? = $ac_status" >&5
++ echo "$as_me:10050: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -12858,7 +12856,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12469 "configure"
-+#line 12467 "configure"
+-#line 12861 "configure"
++#line 12859 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -12566,7 +12564,7 @@ else
+@@ -12954,7 +12952,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 12569 "configure"
-+#line 12567 "configure"
+-#line 12957 "configure"
++#line 12955 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -14569,11 +14567,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14572: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14570: $lt_compile\"" >&5)
+@@ -14974,11 +14972,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14977: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14975: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:14576: \$? = $ac_status" >&5
-+ echo "$as_me:14574: \$? = $ac_status" >&5
+- echo "$as_me:14981: \$? = $ac_status" >&5
++ echo "$as_me:14979: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -14668,11 +14666,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14671: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14669: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14675: \$? = $ac_status" >&5
-+ echo "$as_me:14673: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -14720,11 +14718,11 @@ else
- -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
- -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
- -e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:14723: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14721: $lt_compile\"" >&5)
- (eval "$lt_compile" 2>out/conftest.err)
- ac_status=$?
- cat out/conftest.err >&5
-- echo "$as_me:14727: \$? = $ac_status" >&5
-+ echo "$as_me:14725: \$? = $ac_status" >&5
- if (exit $ac_status) && test -s out/conftest2.$ac_objext
- then
- # The compiler can only warn and ignore the option if not recognized
-@@ -18633,91 +18631,11 @@ if test "x$enable_ssh" = "xno"; then
+@@ -15073,11 +15071,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15076: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15074: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15080: \$? = $ac_status" >&5
++ echo "$as_me:15078: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -15125,11 +15123,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:15128: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15126: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15132: \$? = $ac_status" >&5
++ echo "$as_me:15130: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -19047,91 +19045,11 @@ if test "x$enable_ssh" = "xno"; then
echo "disabling ssh support"
else
- # Extract the first word of "ssh-keygen", so it can be a program name with args.
-set dummy ssh-keygen; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SSH_KEYGEN_PATH+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+- $as_echo_n "(cached) " >&6
-else
- case $SSH_KEYGEN_PATH in
- [\\/]* | ?:[\\/]*)
@@ -176,7 +177,7 @@
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SSH_KEYGEN_PATH="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
@@ -191,20 +192,20 @@
-fi
-SSH_KEYGEN_PATH=$ac_cv_path_SSH_KEYGEN_PATH
-if test -n "$SSH_KEYGEN_PATH"; then
-- { echo "$as_me:$LINENO: result: $SSH_KEYGEN_PATH" >&5
--echo "${ECHO_T}$SSH_KEYGEN_PATH" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $SSH_KEYGEN_PATH" >&5
+-$as_echo "$SSH_KEYGEN_PATH" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-fi
-
-
- # Extract the first word of "ssh", so it can be a program name with args.
-set dummy ssh; ac_word=$2
--{ echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_SSH_PATH+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
+- $as_echo_n "(cached) " >&6
-else
- case $SSH_PATH in
- [\\/]* | ?:[\\/]*)
@@ -219,7 +220,7 @@
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SSH_PATH="$as_dir/$ac_word$ac_exec_ext"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
@@ -232,11 +233,11 @@
-fi
-SSH_PATH=$ac_cv_path_SSH_PATH
-if test -n "$SSH_PATH"; then
-- { echo "$as_me:$LINENO: result: $SSH_PATH" >&5
--echo "${ECHO_T}$SSH_PATH" >&6; }
--else
-- { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
+- { $as_echo "$as_me:$LINENO: result: $SSH_PATH" >&5
+-$as_echo "$SSH_PATH" >&6; }
+-else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
-fi
-
-
@@ -248,7 +249,7 @@
enable_ssh="yes"
cat >>confdefs.h <<\_ACEOF
-@@ -18726,15 +18644,15 @@ _ACEOF
+@@ -19140,15 +19058,15 @@ _ACEOF
cat >>confdefs.h <<_ACEOF
@@ -267,21 +268,3 @@
fi
-@@ -21823,8 +21741,6 @@ GP11_CFLAGS!$GP11_CFLAGS$ac_delim
- GP11_LIBS!$GP11_LIBS$ac_delim
- WITH_PKCS11_TRUE!$WITH_PKCS11_TRUE$ac_delim
- WITH_PKCS11_FALSE!$WITH_PKCS11_FALSE$ac_delim
--SSH_KEYGEN_PATH!$SSH_KEYGEN_PATH$ac_delim
--SSH_PATH!$SSH_PATH$ac_delim
- WITH_SSH_TRUE!$WITH_SSH_TRUE$ac_delim
- WITH_SSH_FALSE!$WITH_SSH_FALSE$ac_delim
- WITH_TESTS_TRUE!$WITH_TESTS_TRUE$ac_delim
-@@ -21849,7 +21765,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: desktop/unstable/seahorse/debian/seahorse.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/seahorse/debian/seahorse.install?rev=20051&op=diff
==============================================================================
--- desktop/unstable/seahorse/debian/seahorse.install (original)
+++ desktop/unstable/seahorse/debian/seahorse.install Wed May 20 12:03:42 2009
@@ -1,5 +1,14 @@
debian/seahorse.xpm /usr/share/pixmaps
-debian/tmp/etc
+debian/tmp/etc/gconf
+debian/tmp/etc/xdg/autostart /usr/share/gnome
debian/tmp/usr/bin
debian/tmp/usr/lib/seahorse
-debian/tmp/usr/share
+debian/tmp/usr/share/man
+debian/tmp/usr/share/omf
+debian/tmp/usr/share/gnome
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/dbus-1
+debian/tmp/usr/share/seahorse
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/pixmaps
More information about the pkg-gnome-commits
mailing list