r13692 - in /desktop/unstable/gdm/debian: Xsession changelog

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Nov 30 09:59:34 2007
New Revision: 13692

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13692
Log:
* gdm.postinst: fix quoting in gdm.conf after upgrading from gdm <
* Read /etc/profile, ~/.profile, /etc/xprofile and ~/.xprofile; this is more
  confortable for users, matches RedHat distros, and matches the
  documentation; closes: #438866.

Modified:
    desktop/unstable/gdm/debian/Xsession
    desktop/unstable/gdm/debian/changelog

Modified: desktop/unstable/gdm/debian/Xsession
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/Xsession?rev=13692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/Xsession (original)
+++ desktop/unstable/gdm/debian/Xsession Fri Nov 30 09:59:34 2007
@@ -102,6 +102,13 @@
 # good for debugging where things went wrong
 echo "$0: Beginning session setup..."
 
+# First read /etc/profile and .profile
+test -f /etc/profile && . /etc/profile
+test -f "$HOME/.profile" && . "$HOME/.profile"
+# Second read /etc/xprofile and .xprofile for X specific setup
+test -f /etc/xprofile && . /etc/xprofile
+test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
+
 # Translation stuff
 if [ -x "/usr/lib/gdm/gdmtranslate" ] ; then
   gdmtranslate="/usr/lib/gdm/gdmtranslate"

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=13692&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog (original)
+++ desktop/unstable/gdm/debian/changelog Fri Nov 30 09:59:34 2007
@@ -1,5 +1,6 @@
 gdm (2.20.1-3) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * debian/gdm.init:
     + Use the basename of the contents of
       /etc/X11/default-display-manager, to allow the user to specify a
@@ -9,10 +10,15 @@
   * Suggest libpam-gnome-keyring.
   * 35_gdm.conf.patch: set Browser=true so that themes with a face
     browser work correctly. Closes: #445743.
-  * gdm.postinst: fix quoting in gdm.conf after upgrading from gdm < 
+  * gdm.postinst: fix quoting in gdm.conf after upgrading from gdm <
     2.20. Closes: #445947.
 
- -- Josselin Mouette <joss at debian.org>  Sun, 25 Nov 2007 11:32:50 +0100
+  [ Loic Minier ]
+  * Read /etc/profile, ~/.profile, /etc/xprofile and ~/.xprofile; this is more
+    confortable for users, matches RedHat distros, and matches the
+    documentation; closes: #438866.
+
+ -- Loic Minier <lool at fox.dooz.org>  Fri, 30 Nov 2007 10:57:40 +0100
 
 gdm (2.20.1-2) unstable; urgency=low