Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (e847ac67ea33a74362b04fbb52c92bf9a900cabb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (e847ac67ea33a74362b04fbb52c92bf9a900cabb)
  • Date: Mon, 21 Jun 2010 06:21:29 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

dev/null |binary
gnome2-libs/gnome-keyring/DETAILS | 4
gnome2-libs/gnome-keyring/HISTORY | 4
gnome2-libs/gnome-keyring/PRE_BUILD | 4
gnome2-libs/gnome-keyring/bug610715.patch | 66
-------------
gnome2-libs/gnome-keyring/gnome-keyring-2.30.1.tar.bz2.sig | 0
gnome2-libs/gnome-keyring/gnome-keyring-2.30.2.tar.bz2.sig |binary
7 files changed, 6 insertions(+), 72 deletions(-)

New commits:
commit e847ac67ea33a74362b04fbb52c92bf9a900cabb
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

gnome-keyring 2.30.2

Eric S., do we really need that patch?
According to https://bugzilla.gnome.org/show_bug.cgi?id=610715#c8 it is
OK without it. BTW new org.freedesktop.secrets.service is included in
this version.

diff --git a/gnome2-libs/gnome-keyring/DETAILS
b/gnome2-libs/gnome-keyring/DETAILS
index 9f0cacb..6c88e84 100755
--- a/gnome2-libs/gnome-keyring/DETAILS
+++ b/gnome2-libs/gnome-keyring/DETAILS
@@ -1,12 +1,12 @@
SPELL=gnome-keyring
- VERSION=2.30.1
+ VERSION=2.30.2
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$GNOME_URL/sources/$SPELL/$BRANCH/$SOURCE
SOURCE_GPG=gurus.gpg:$SOURCE.sig
LICENSE[0]=LGPL
- PATCHLEVEL=1
+ PATCHLEVEL=0
WEB_SITE=http://live.gnome.org/GnomeKeyring
ENTERED=20020505
KEYWORDS="gnome2 libs"
diff --git a/gnome2-libs/gnome-keyring/HISTORY
b/gnome2-libs/gnome-keyring/HISTORY
index acd03ee..c9966af 100644
--- a/gnome2-libs/gnome-keyring/HISTORY
+++ b/gnome2-libs/gnome-keyring/HISTORY
@@ -1,3 +1,7 @@
+2010-06-21 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.30.2
+ * PRE_BUILD, bug610715.patch: removed
+
2010-05-06 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Apply bug610715.patch
diff --git a/gnome2-libs/gnome-keyring/PRE_BUILD
b/gnome2-libs/gnome-keyring/PRE_BUILD
deleted file mode 100755
index 6e35c28..0000000
--- a/gnome2-libs/gnome-keyring/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-message "${MESSAGE_COLOR}Apply patch for GNOME Bug
#610715...${DEFAULT_COLOR}" &&
-patch -p1 < $SPELL_DIRECTORY/bug610715.patch
diff --git a/gnome2-libs/gnome-keyring/bug610715.patch
b/gnome2-libs/gnome-keyring/bug610715.patch
deleted file mode 100644
index c09fffc..0000000
--- a/gnome2-libs/gnome-keyring/bug610715.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/gnome-keyring-2.30.1.tar.bz2.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-2.30.1.tar.bz2.sig
deleted file mode 100644
index 21f6028..0000000
Binary files a/gnome2-libs/gnome-keyring/gnome-keyring-2.30.1.tar.bz2.sig and
/dev/null differ
diff --git a/gnome2-libs/gnome-keyring/gnome-keyring-2.30.2.tar.bz2.sig
b/gnome2-libs/gnome-keyring/gnome-keyring-2.30.2.tar.bz2.sig
new file mode 100644
index 0000000..4a3a0ef
Binary files /dev/null and
b/gnome2-libs/gnome-keyring/gnome-keyring-2.30.2.tar.bz2.sig differ




Archive powered by MHonArc 2.6.24.

Top of Page