[SM-Commit] GIT changes to master grimoire by Eric Sandall (9480b8fc9fae30484da65b0f604c06ee7cb67781)

Eric Sandall scm at sourcemage.org
Fri May 7 03:52:26 EDT 2010


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 gnome2-libs/gnome-keyring/HISTORY         |    4 -
 gnome2-libs/gnome-keyring/PRE_BUILD       |    4 -
 gnome2-libs/gnome-keyring/bug525434.patch |   66 ------------------------------
 gnome2-libs/gnome-keyring/bug610715.patch |   66 ++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 70 deletions(-)

New commits:
commit 9480b8fc9fae30484da65b0f604c06ee7cb67781
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    gnome-keyring: Fix GNOME Bug #610715
    Configures gnome-keyring to start for all DEs, not just GNOME or LXDE
    PATCHLEVEL++

commit 72534c6e3e31707986152a6c620486cdbc8fdc3d
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    Revert "gnome-keyring: Fix GNOME Bug #525434"
    
    This reverts commit 39ac6cfc0e8a2f797cd04783bdd86e9dbeb46d3e.
    
    Refers to the wrong bug# (that's the
    https://bugs.launchpad.net/ubuntu/+source/gnome-keyring/+bug/525434 bug)

diff --git a/gnome2-libs/gnome-keyring/HISTORY b/gnome2-libs/gnome-keyring/HISTORY
index 8ed22c5..acd03ee 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,7 +1,7 @@
 2010-05-06 Eric Sandall <sandalle at sourcemage.org>
 	* DETAILS: PATCHLEVEL++
-	* PRE_BUILD: Apply bug525434.patch
-	* bug525434.patch: Fix GNOME Bug #525434
+	* PRE_BUILD: Apply bug610715.patch
+	* bug610715.patch: Fix GNOME Bug #610715
 	  Configures gnome-keyring to start for all DEs, not just GNOME or LXDE
 
 2010-05-03 Ladislav Hagara <hgr at vabo.cz>
diff --git a/gnome2-libs/gnome-keyring/PRE_BUILD b/gnome2-libs/gnome-keyring/PRE_BUILD
index f044874..6e35c28 100755
--- a/gnome2-libs/gnome-keyring/PRE_BUILD
+++ b/gnome2-libs/gnome-keyring/PRE_BUILD
@@ -1,4 +1,4 @@
 default_pre_build &&
 cd $SOURCE_DIRECTORY &&
-message "${MESSAGE_COLOR}Apply patch for GNOME Bug #525434...${DEFAULT_COLOR}" &&
-patch -p1 < $SPELL_DIRECTORY/bug525434.patch
+message "${MESSAGE_COLOR}Apply patch for GNOME Bug #610715...${DEFAULT_COLOR}" &&
+patch -p1 < $SPELL_DIRECTORY/bug610715.patch
diff --git a/gnome2-libs/gnome-keyring/bug525434.patch b/gnome2-libs/gnome-keyring/bug525434.patch
deleted file mode 100644
index c09fffc..0000000
--- a/gnome2-libs/gnome-keyring/bug525434.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in
---- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:27:39.792857884 -0700
-+++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:32:08.503107570 -0700
-@@ -3,7 +3,6 @@
- _Name=Certificate and Key Storage
- _Comment=GNOME Keyring: PKCS#11 Component
- Exec= gnome-keyring-daemon --start --components=pkcs11
--OnlyShowIn=GNOME;LXDE;
- AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-AutoRestart=false
-diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in
---- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
-+++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:32:10.361857745 -0700
-@@ -3,7 +3,6 @@
- _Name=Certificate and Key Storage
- _Comment=GNOME Keyring: PKCS#11 Component
- Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=pkcs11
--OnlyShowIn=GNOME;LXDE;
- AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-AutoRestart=false
-diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in
---- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:39.792857884 -0700
-+++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:52.119857815 -0700
-@@ -3,7 +3,6 @@
- _Name=Secret Storage Service
- _Comment=GNOME Keyring: Secret Service
- Exec= gnome-keyring-daemon --start --components=secrets
--OnlyShowIn=GNOME;LXDE;
- AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-AutoRestart=false
-diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in
---- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
-+++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:48.458857814 -0700
-@@ -3,7 +3,6 @@
- _Name=Secret Storage Service
- _Comment=GNOME Keyring: Secret Service
- Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=secrets
--OnlyShowIn=GNOME;LXDE;
- AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-AutoRestart=false
-diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in
---- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:27:39.792857884 -0700
-+++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:32:14.603857675 -0700
-@@ -3,7 +3,6 @@
- _Name=SSH Key Agent
- _Comment=GNOME Keyring: SSH Agent
- Exec= gnome-keyring-daemon --start --components=ssh
--OnlyShowIn=GNOME;LXDE;
- AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-AutoRestart=false
-diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in
---- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:27:39.790857884 -0700
-+++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:32:16.422857745 -0700
-@@ -3,7 +3,6 @@
- _Name=SSH Key Agent
- _Comment=GNOME Keyring: SSH Agent
- Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=ssh
--OnlyShowIn=GNOME;LXDE;
- AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
- X-GNOME-Autostart-Phase=Initialization
- X-GNOME-AutoRestart=false
diff --git a/gnome2-libs/gnome-keyring/bug610715.patch b/gnome2-libs/gnome-keyring/bug610715.patch
new file mode 100644
index 0000000..c09fffc
--- /dev/null
+++ b/gnome2-libs/gnome-keyring/bug610715.patch
@@ -0,0 +1,66 @@
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in	2010-05-07 00:32:08.503107570 -0700
+@@ -3,7 +3,6 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec= gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-pkcs11.desktop.in.in	2010-05-07 00:32:10.361857745 -0700
+@@ -3,7 +3,6 @@
+ _Name=Certificate and Key Storage
+ _Comment=GNOME Keyring: PKCS#11 Component
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=pkcs11
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/pkcs11
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in	2010-05-07 00:27:52.119857815 -0700
+@@ -3,7 +3,6 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec= gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:39.791857675 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-secrets.desktop.in.in	2010-05-07 00:27:48.458857814 -0700
+@@ -3,7 +3,6 @@
+ _Name=Secret Storage Service
+ _Comment=GNOME Keyring: Secret Service
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=secrets
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/secrets
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:27:39.792857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in	2010-05-07 00:32:14.603857675 -0700
+@@ -3,7 +3,6 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec= gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false
+diff -Naur gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in
+--- gnome-keyring-2.30.1.orig/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:27:39.790857884 -0700
++++ gnome-keyring-2.30.1/daemon/gnome-keyring-ssh.desktop.in.in	2010-05-07 00:32:16.422857745 -0700
+@@ -3,7 +3,6 @@
+ _Name=SSH Key Agent
+ _Comment=GNOME Keyring: SSH Agent
+ Exec=@VALGRIND_RUN@ gnome-keyring-daemon --start --components=ssh
+-OnlyShowIn=GNOME;LXDE;
+ AutostartCondition=GNOME /apps/gnome-keyring/daemon-components/ssh
+ X-GNOME-Autostart-Phase=Initialization
+ X-GNOME-AutoRestart=false



More information about the SM-Commit mailing list