r27715 - in /desktop/unstable/gnome-keyring/debian: README.Debian changelog

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Apr 21 06:40:35 2011
New Revision: 27715

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27715
Log:
README.Debian: document how to disable gnome-keyring components.
Closes: #623539.

Modified:
    desktop/unstable/gnome-keyring/debian/README.Debian
    desktop/unstable/gnome-keyring/debian/changelog

Modified: desktop/unstable/gnome-keyring/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/README.Debian?rev=27715&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/README.Debian [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/README.Debian [utf-8] Thu Apr 21 06:40:35 2011
@@ -21,9 +21,14 @@
 gnome-about-me for example), the password for the login keyrign should 
 be updated automatically.
 
- SSH agent
- ---------
-The GNOME keyring includes the functionality of the SSH agent, and it 
-can break some setups, especially if ssh-agent is started by hand. If 
-you want to disable it, you can set the 
-/apps/gnome-keyring/daemon-components/ssh GConf key to false.
+ SSH and GPG agents
+ ------------------
+The GNOME keyring includes the functionality of the SSH and GPG agents, 
+and it can break some setups, especially if ssh-agent and/or gpg-agent 
+is started by hand.
+
+You can disable a specific component by removing the gnome-keyring-gpg 
+and gnome-keyring-ssh elements from the startup applications. The 
+interface depends on your session manager; for GNOME you can use 
+gnome-session-properties. You can also simply edit 
+/etc/xdg/autostart/gnome-keyring-*.desktop.

Modified: desktop/unstable/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/changelog?rev=27715&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/changelog [utf-8] Thu Apr 21 06:40:35 2011
@@ -5,6 +5,8 @@
     Closes: #622875, #623335.
   * Break seahorse-plugins < 3.0, since it takes over the GPG 
     functionality.
+  * README.Debian: document how to disable gnome-keyring components.
+    Closes: #623539.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 16 Apr 2011 18:41:54 +0200