diff -u gnome-keyring-2.24.1/debian/rules gnome-keyring-2.24.1/debian/rules --- gnome-keyring-2.24.1/debian/rules +++ gnome-keyring-2.24.1/debian/rules @@ -11 +11 @@ - --enable-tests + --enable-tests --disable-ssh-agent diff -u gnome-keyring-2.24.1/debian/changelog gnome-keyring-2.24.1/debian/changelog --- gnome-keyring-2.24.1/debian/changelog +++ gnome-keyring-2.24.1/debian/changelog @@ -1,3 +1,9 @@ +gnome-keyring (2.24.1-0ubuntu2~ppa1) intrepid; urgency=low + + * Removed SSH support from gnome-keyring-daemon. (LP: #275010) + + -- Kenny Millington Sat, 08 Nov 2008 18:03:04 +0000 + gnome-keyring (2.24.1-0ubuntu1) intrepid; urgency=low * New upstream version: only in patch2: unchanged: --- gnome-keyring-2.24.1.orig/debian/patches/02-build-without-ssh.patch +++ gnome-keyring-2.24.1/debian/patches/02-build-without-ssh.patch @@ -0,0 +1,20 @@ +diff -Nur -x '*.orig' -x '*~' gnome-keyring-2.24.1/daemon/Makefile.in gnome-keyring-2.24.1.new/daemon/Makefile.in +--- gnome-keyring-2.24.1/daemon/Makefile.in 2008-10-19 09:32:40.000000000 +0100 ++++ gnome-keyring-2.24.1.new/daemon/Makefile.in 2008-11-08 19:00:24.000000000 +0000 +@@ -286,15 +286,13 @@ + target_alias = @target_alias@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-@WITH_SSH_FALSE@SSH_DIR = +-@WITH_SSH_TRUE@SSH_DIR = ssh + SUBDIRS = \ + ui \ + keyrings \ + pkix \ + pk \ + pkcs11 \ +- $(SSH_DIR) \ ++ ssh \ + data + + INCLUDES = \