[25689] in Source-Commits
/svn/athena r25171 - trunk/debathena/config/gdm-config/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Jun 27 10:34:49 2011
Date: Mon, 27 Jun 2011 10:34:09 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201106271434.p5REY9kr010883@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2011-06-27 10:34:09 -0400 (Mon, 27 Jun 2011)
New Revision: 25171
Added:
trunk/debathena/config/gdm-config/debian/athena-session
Modified:
trunk/debathena/config/gdm-config/debian/athena.desktop
trunk/debathena/config/gdm-config/debian/changelog
trunk/debathena/config/gdm-config/debian/control.in
trunk/debathena/config/gdm-config/debian/rules
Log:
In gdm-config:
* Ship our own athena-session and do logic in that
* Make the implict dependencyies on gnome-session and python explicit
Added: trunk/debathena/config/gdm-config/debian/athena-session
===================================================================
--- trunk/debathena/config/gdm-config/debian/athena-session (rev 0)
+++ trunk/debathena/config/gdm-config/debian/athena-session 2011-06-27 14:34:09 UTC (rev 25171)
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# A wrapper script to decide how to invoke gnome-session
+GNOME_SESSION_VER=`dpkg-query --showformat='${Version}' --show gnome-session`
+
+SESSION="gnome-session"
+ARGS=""
+
+# STDERR will go somewhere useful at this point, right?
+echo "**** Athena session wrapper (/usr/bin/athena-session)" >&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
+fi
+
+exec "$SESSION" "$ARGS" "$@"
Property changes on: trunk/debathena/config/gdm-config/debian/athena-session
___________________________________________________________________
Added: svn:executable
+ *
Modified: trunk/debathena/config/gdm-config/debian/athena.desktop
===================================================================
--- trunk/debathena/config/gdm-config/debian/athena.desktop 2011-06-27 01:47:42 UTC (rev 25170)
+++ trunk/debathena/config/gdm-config/debian/athena.desktop 2011-06-27 14:34:09 UTC (rev 25171)
@@ -2,8 +2,7 @@
Encoding=UTF-8
Name=Athena Default Session
Comment=Login to Athena
-Exec=gnome-session --session=classic-gnome
-TryExec=gnome-session
+Exec=athena-session
+TryExec=athena-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-27 01:47:42 UTC (rev 25170)
+++ trunk/debathena/config/gdm-config/debian/changelog 2011-06-27 14:34:09 UTC (rev 25171)
@@ -1,3 +1,10 @@
+debathena-gdm-config (1.28) unstable; urgency=low
+
+ * Ship our own athena-session and do logic in that
+ * Make the implict dependencyies on gnome-session and python explicit
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 27 Jun 2011 10:20:46 -0400
+
debathena-gdm-config (1.27.1) unstable; urgency=low
* Don't fail in maintainer scripts, even if the Debian utilities are
Modified: trunk/debathena/config/gdm-config/debian/control.in
===================================================================
--- trunk/debathena/config/gdm-config/debian/control.in 2011-06-27 01:47:42 UTC (rev 25170)
+++ trunk/debathena/config/gdm-config/debian/control.in 2011-06-27 14:34:09 UTC (rev 25171)
@@ -7,7 +7,7 @@
Package: debathena-gdm-config
Architecture: all
-Depends: gdm, ${misc:Depends}, ${debathena-gdm-gconf-depends}
+Depends: gdm, gnome-session, python, ${misc:Depends}, ${debathena-gdm-gconf-depends}
Provides: ${diverted-files}
Conflicts: ${diverted-files}
Breaks: debathena-reactivate (<< 1.22~)
Modified: trunk/debathena/config/gdm-config/debian/rules
===================================================================
--- trunk/debathena/config/gdm-config/debian/rules 2011-06-27 01:47:42 UTC (rev 25170)
+++ trunk/debathena/config/gdm-config/debian/rules 2011-06-27 14:34:09 UTC (rev 25171)
@@ -41,6 +41,7 @@
dh_install debian/background.jpg usr/share/debathena-gdm-config
dh_install debian/%gconf-tree.xml var/lib/gdm/.gconf.debathena-gdm-config
dh_install debian/athena.desktop usr/share/xsessions
+ dh_install debian/athena-session usr/bin
install -m 660 debian/gconf.path.debathena debian/$(cdbs_curpkg)/var/lib/gdm/.gconf.path.debathena
dh_install debian/debathena-branding usr/lib/debathena-branding
