[26370] in Source-Commits
Re: /svn/athena r25535 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Thu May 31 02:19:59 2012
Date: Thu, 31 May 2012 02:19:57 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201205301631.q4UGVh5b029637@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1205310219420.18441@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
My kingdom for a stable API...ACK
-Ben
On Wed, 30 May 2012, Jonathan D Reed wrote:
> 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
>
>
