[25653] in Source-Commits
/svn/athena r25146 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jun 20 10:15:55 2011
Date: Mon, 20 Jun 2011 10:15:48 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106201415.p5KEFmVn027082@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-20 10:15:48 -0400 (Mon, 20 Jun 2011)
New Revision: 25146
Added:
trunk/debathena/config/gdm-config/debian/athena.desktop
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
trunk/debathena/config/gdm-config/debian/rules
Log:
In gdm-config:
* Add new Athena session (Trac #850)
Added: trunk/debathena/config/gdm-config/debian/athena.desktop
===================================================================
--- trunk/debathena/config/gdm-config/debian/athena.desktop (rev 0)
+++ trunk/debathena/config/gdm-config/debian/athena.desktop 2011-06-20 14:15:48 UTC (rev 25146)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Athena Default Session
+Comment=Login to Athena
+Exec=gnome-session --session=classic-gnome
+TryExec=gnome-session
+Icon=
+Type=Application
+X-Ubuntu-Gettext-Domain=gnome-session-2.0
Modified: trunk/debathena/config/gdm-config/debian/changelog
===================================================================
--- trunk/debathena/config/gdm-config/debian/changelog 2011-06-20 04:17:31 UTC (rev 25145)
+++ trunk/debathena/config/gdm-config/debian/changelog 2011-06-20 14:15:48 UTC (rev 25146)
@@ -1,3 +1,9 @@
+debathena-gdm-config (1.27) UNRELEASED; urgency=low
+
+ * Add new Athena session (Trac #850)
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 20 Jun 2011 10:15:07 -0400
+
debathena-gdm-config (1.26.1) unstable; urgency=low
* Only request a reboot on upgrade, not the first install
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst 2011-06-20 04:17:31 UTC (rev 25145)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.postinst 2011-06-20 14:15:48 UTC (rev 25146)
@@ -83,6 +83,11 @@
cleanup_old_diversion /usr/share/images/xsplash/throbber_xtra_large.debathena.png
fi
+ 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
+ fi
+
if test -f /var/run/gdm.pid ; then
if hash invoke-rc.d 2>/dev/null; then
invoke-rc.d gdm reload || true
Modified: trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm
===================================================================
--- trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm 2011-06-20 04:17:31 UTC (rev 25145)
+++ trunk/debathena/config/gdm-config/debian/debathena-gdm-config.prerm 2011-06-20 14:15:48 UTC (rev 25146)
@@ -21,6 +21,11 @@
remove|upgrade|deconfigure)
update-alternatives --remove debathena-metapackage.svg \
/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
+ fi
+
;;
failed-upgrade)
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2011-06-20 04:17:31 UTC (rev 25145)
+++ trunk/debathena/config/gdm-config/debian/rules 2011-06-20 14:15:48 UTC (rev 25146)
@@ -36,6 +36,7 @@
ifneq ($(NEW_GDM),y)
install/debathena-gdm-config::
dh_install debian/default.desktop.debathena usr/share/gdm/BuiltInSessions
+ dh_install debian/athena.desktop usr/share/xsessions
else
install/debathena-gdm-config::
dh_install debian/background.jpg usr/share/debathena-gdm-config
