r26797 - in /desktop/experimental/gnome-keyring/debian: changelog patches/05_use_in_xfce.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Tue Mar  8 10:16:25 2011
New Revision: 26797

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26797
Log:
debian/patches/05_use_in_xfce.patch: Make gnome-keyring-daemon also start
for XFCE, take from Ubuntu (Closes: #522493)

Added:
    desktop/experimental/gnome-keyring/debian/patches/05_use_in_xfce.patch
Modified:
    desktop/experimental/gnome-keyring/debian/changelog
    desktop/experimental/gnome-keyring/debian/patches/series

Modified: desktop/experimental/gnome-keyring/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/changelog?rev=26797&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/changelog [utf-8] Tue Mar  8 10:16:25 2011
@@ -11,11 +11,13 @@
   * debian/patches/04_link-libtasns1.patch,
     d/p/0001-Link-directly-to-gmodule-for-the-modules-that-need-i.patch:
     Drop patches, not needed anymore
+  * debian/patches/05_use_in_xfce.patch: Make gnome-keyring-daemon also start
+    for XFCE, take from Ubuntu (Closes: #522493)
   * debian/gnome-keyring.install: Drop
     - debian/tmp/usr/share/gnome-keyring/introspect
     - debian/tmp/etc/xdg/pkcs11.conf.defaults
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 07 Mar 2011 20:59:36 +0100
+ -- Laurent Bigonville <bigon at debian.org>  Tue, 08 Mar 2011 11:15:58 +0100
 
 gnome-keyring (2.91.4-3) experimental; urgency=low
 

Added: desktop/experimental/gnome-keyring/debian/patches/05_use_in_xfce.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/05_use_in_xfce.patch?rev=26797&op=file
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/05_use_in_xfce.patch (added)
+++ desktop/experimental/gnome-keyring/debian/patches/05_use_in_xfce.patch [utf-8] Tue Mar  8 10:16:25 2011
@@ -1,0 +1,44 @@
+--- a/daemon/gnome-keyring-gpg.desktop.in.in
++++ b/daemon/gnome-keyring-gpg.desktop.in.in
+@@ -3,7 +3,7 @@
+ _Name=GPG Password Agent
+ _Comment=GNOME Keyring: GPG Agent
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=gpg
+-OnlyShowIn=GNOME;LXDE;
++OnlyShowIn=GNOME;LXDE;XFCE;
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
+--- a/daemon/gnome-keyring-pkcs11.desktop.in.in
++++ b/daemon/gnome-keyring-pkcs11.desktop.in.in
+@@ -3,7 +3,7 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
++OnlyShowIn=GNOME;LXDE;XFCE;
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
+--- a/daemon/gnome-keyring-secrets.desktop.in.in
++++ b/daemon/gnome-keyring-secrets.desktop.in.in
+@@ -3,7 +3,7 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
++OnlyShowIn=GNOME;LXDE;XFCE;
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true
+--- a/daemon/gnome-keyring-ssh.desktop.in.in
++++ b/daemon/gnome-keyring-ssh.desktop.in.in
+@@ -3,7 +3,7 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec=@VALGRIND_RUN@@BINDIR@/gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
++OnlyShowIn=GNOME;LXDE;XFCE;
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+ X-GNOME-Autostart-Notify=true

Modified: desktop/experimental/gnome-keyring/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-keyring/debian/patches/series?rev=26797&op=diff
==============================================================================
--- desktop/experimental/gnome-keyring/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-keyring/debian/patches/series [utf-8] Tue Mar  8 10:16:25 2011
@@ -1,3 +1,4 @@
 01_pam-logging-less-verbose.patch
 03_kfreebsd.patch
+05_use_in_xfce.patch
 99_ltmain_as-needed.patch