[25679] in Source-Commits
Re: /svn/athena r25163 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Jun 24 14:00:16 2011
Date: Fri, 24 Jun 2011 14:00:05 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Jonathan D Reed <jdreed@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201106231805.p5NI5Dk0011647@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1106241357460.6818@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
The indentation seems to have changed, but I'll ACK this and r25162 with
the whitespace fixup.
-Ben
On Thu, 23 Jun 2011, Jonathan D Reed wrote:
> Author: jdreed
> Date: 2011-06-23 14:05:13 -0400 (Thu, 23 Jun 2011)
> New Revision: 25163
>
> Modified:
> trunk/debathena/config/gdm-config/debian/changelog
> trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst
> trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm
> Log:
> In gdm-config:
> * Don't fail in maintainer scripts, even if the Debian utilities are
> stupid
>
>
> Modified: trunk/debathena/config/gdm-config/debian/changelog
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/changelog 2011-06-23 14:36:31 UTC (rev 25162)
> +++ trunk/debathena/config/gdm-config/debian/changelog 2011-06-23 18:05:13 UTC (rev 25163)
> @@ -1,3 +1,10 @@
> +debathena-gdm-config (1.27.1) unstable; urgency=low
> +
> + * Don't fail in maintainer scripts, even if the Debian utilities are
> + stupid
> +
> + -- Jonathan Reed <jdreed@mit.edu> Thu, 23 Jun 2011 14:02:51 -0400
> +
> debathena-gdm-config (1.27) unstable; urgency=low
>
> * Add new Athena session (Trac #850)
>
> Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst 2011-06-23 14:36:31 UTC (rev 25162)
> +++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst 2011-06-23 18:05:13 UTC (rev 25163)
> @@ -85,7 +85,9 @@
>
> if [ -f /usr/share/xsessions/athena.desktop ] && \
> [ -x /usr/lib/gdm/gdm-set-default-session ]; then
> - /usr/lib/gdm/gdm-set-default-session -k athena
> + # Sigh. This exits non-zero if there already is a default
> + # session, but only if DBus is running.
> + /usr/lib/gdm/gdm-set-default-session -k athena || true
> fi
>
> if test -f /var/run/gdm.pid ; then
>
> Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm
> ===================================================================
> --- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm 2011-06-23 14:36:31 UTC (rev 25162)
> +++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm 2011-06-23 18:05:13 UTC (rev 25163)
> @@ -23,7 +23,9 @@
> /usr/share/gdm/themes/debathena/metapackage-unknown.svg
> if [ -f /usr/share/xsessions/athena.desktop ] && \
> [ -x /usr/lib/gdm/gdm-set-default-session ]; then
> - /usr/lib/gdm/gdm-set-default-session -r athena
> + # Sigh. This exits non-zero if there already is a default
> + # session, but only if DBus is running.
> + /usr/lib/gdm/gdm-set-default-session -r athena || true
> fi
>
> ;;
>
>
