From ae60fe635fa12e6d46fce1406186cbe7617657c3 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 16 Mar 2013 10:38:13 +0100 Subject: [PATCH] * usr/bin/start* - Remove gnome-keyring workaround, since we have the proper fix for ssh. --- debian/changelog | 7 +++++++ usr/bin/startlubuntu | 6 ------ usr/bin/startlubuntu-lxgames | 6 ------ usr/bin/startlubuntu-netbook | 6 ------ usr/bin/startlubuntu-nexus7 | 6 ------ 5 files changed, 7 insertions(+), 24 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8f9509..781415b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lubuntu-default-settings (0.32) UNRELEASED; urgency=low + + * usr/bin/start* + - Remove gnome-keyring workaround, since we have the proper fix for ssh. + + -- Julien Lavergne Sat, 16 Mar 2013 10:37:20 +0100 + lubuntu-default-settings (0.31) raring; urgency=low * Add a new Lubuntu-Nexus7 session. diff --git a/usr/bin/startlubuntu b/usr/bin/startlubuntu index 7b6880b..7340ebe 100644 --- a/usr/bin/startlubuntu +++ b/usr/bin/startlubuntu @@ -70,12 +70,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then eval "$(dbus-launch --sh-syntax --exit-with-session)" fi -# Export Gnome-keyring variables if needed -# See bug #664206 -if which gnome-keyring-daemon >/dev/null; then - export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) -fi - # Start SSH agent, require since 3.5 # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) SSHAGENT="/usr/bin/ssh-agent" diff --git a/usr/bin/startlubuntu-lxgames b/usr/bin/startlubuntu-lxgames index ad76ad2..9a2fa5d 100644 --- a/usr/bin/startlubuntu-lxgames +++ b/usr/bin/startlubuntu-lxgames @@ -70,12 +70,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then eval "$(dbus-launch --sh-syntax --exit-with-session)" fi -# Export Gnome-keyring variables if needed -# See bug #664206 -if which gnome-keyring-daemon >/dev/null; then - export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) -fi - # Start SSH agent, require since 3.5 # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) SSHAGENT="/usr/bin/ssh-agent" diff --git a/usr/bin/startlubuntu-netbook b/usr/bin/startlubuntu-netbook index 15c5a09..a38ba6d 100644 --- a/usr/bin/startlubuntu-netbook +++ b/usr/bin/startlubuntu-netbook @@ -70,12 +70,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then eval "$(dbus-launch --sh-syntax --exit-with-session)" fi -# Export Gnome-keyring variables if needed -# See bug #664206 -if which gnome-keyring-daemon >/dev/null; then - export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) -fi - # Start SSH agent, require since 3.5 # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) SSHAGENT="/usr/bin/ssh-agent" diff --git a/usr/bin/startlubuntu-nexus7 b/usr/bin/startlubuntu-nexus7 index 4a8b7f8..103aaa1 100644 --- a/usr/bin/startlubuntu-nexus7 +++ b/usr/bin/startlubuntu-nexus7 @@ -71,12 +71,6 @@ if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then eval "$(dbus-launch --sh-syntax --exit-with-session)" fi -# Export Gnome-keyring variables if needed -# See bug #664206 -if which gnome-keyring-daemon >/dev/null; then - export $(/usr/bin/gnome-keyring-daemon --start --components=ssh) -fi - # Start SSH agent, require since 3.5 # (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) SSHAGENT="/usr/bin/ssh-agent"