[26358] in Source-Commits
/svn/athena r25535 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed May 30 12:31:44 2012
Date: Wed, 30 May 2012 12:31:43 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205301631.q4UGVh5b029637@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-30 12:31:43 -0400 (Wed, 30 May 2012)
New Revision: 25535
Modified:
trunk/debathena/config/gdm-config/debian/athena-session
trunk/debathena/config/gdm-config/debian/changelog
Log:
In gdm-config:
* Update athena-session for the Unity world
Modified: trunk/debathena/config/gdm-config/debian/athena-session
===================================================================
--- trunk/debathena/config/gdm-config/debian/athena-session 2012-05-30 15:14:39 UTC (rev 25534)
+++ trunk/debathena/config/gdm-config/debian/athena-session 2012-05-30 16:31:43 UTC (rev 25535)
@@ -8,12 +8,22 @@
# STDERR will go somewhere useful at this point, right?
echo "**** Athena session wrapper (/usr/bin/athena-session)" >&2
+echo "**** session started at $(date)" >&2
# Support for --session was added in gnome-session 2.32.1-0ubuntu2
# according to the changelog
if dpkg --compare-versions "$GNOME_SESSION_VER" ge '2.32.1-0ubuntu2~'; then
- ARGS="--session=classic-gnome"
- echo " Unity detected, invoking classic GNOME session." >&2
+ if [ -e /usr/share/gnome-session/sessions/classic-gnome.session ]; then
+ ARGS="--session=classic-gnome"
+ elif [ -e /usr/share/gnome-session/sessions/ubuntu-2d.session ]; then
+ ARGS="--session=ubuntu-2d"
+ elif [ -e /usr/share/gnome-session/sessions/ubuntu.session ]; then
+ ARGS="--session=ubuntu"
+ else
+ zenity --error --text="Can't find a valid GNOME session to run (shouldn't happen). Please report this error to bugs@mit.edu and mention the hostname ($(hostname -f)) in your report."
+ exit 1
+ fi
fi
+echo "**** About to run $SESSION $ARGS $@" >&2
exec "$SESSION" "$ARGS" "$@"
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2012-05-30 15:14:39 UTC (rev 25534)
+++ trunk/debathena/config/gdm-config/debian/changelog 2012-05-30 16:31:43 UTC (rev 25535)
@@ -1,3 +1,9 @@
+debathena-gdm-config (1.37) unstable; urgency=low
+
+ * Update athena-session for the Unity world
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 30 May 2012 12:30:06 -0400
+
debathena-gdm-config (1.36) unstable; urgency=low
* Populate the GtkImage prior to window mapping so that positioning the
