Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2013-06-11 06:40:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xdm (Old) and /work/SRC/openSUSE:Factory/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm" Changes: -------- --- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2013-05-27 10:11:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-06-11 09:38:32.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 7 10:25:15 UTC 2013 - [email protected] + +- Add some GNOME specifiv magics to Xsession to allow that ~/.i18n + is always sourced (bnc#567324) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xsession new/etc/X11/xdm/Xsession --- old/etc/X11/xdm/Xsession 2013-05-24 14:53:01.000000000 +0200 +++ new/etc/X11/xdm/Xsession 2013-06-07 11:09:00.000000000 +0200 @@ -4,7 +4,7 @@ # script of the user for logon. # # Copyright (c) 1998-2000 SuSE GmbH Nuernberg, Germany. -# Copyright (c) 2005 SUSE LINUX Products GmbH +# Copyright (c) 2005-2013 SUSE LINUX Products GmbH # please report bugfixes or comments at http://www.suse.de/feedback. # # Author: Werner Fink <[email protected]> @@ -120,11 +120,14 @@ for errfile in "${HOME}/.xsession-errors" \ "${TMPDIR:-/tmp}/xerr-${USER}-${DISPLAY}" do - # GDM seems to handle this its self - test -z "$GDMSESSION" || break + stderr=$(readlink -f /dev/stderr 2>/dev/null) - # Once if KDM does handle this its self - #test -z "$KDMSESSION" || break + # Some DM seem to handle this them self + case "$stderr" in + /var/*|/tmp/*|/dev/*) + ;; + *) break + esac # Avoid bad symbolic links # mv(1) uses rename(2) on the *same* file system @@ -172,6 +175,11 @@ export WINDOWMANAGER # +# By default we set system defaults for the language +# +. /etc/profile.d/lang.sh + +# # Handle arguments given by xdm/kdm/gdm. # forced=no @@ -188,26 +196,36 @@ let argc++ || : case "$l" in [a-z][a-z]_[A-Z][A-Z]*) - LANG=$l - export LANG + GDM_LANG=$l break esac done unset argv[$argc] unset l - readonly argv - # get the system default locale settings: - if test -z "$LANG" -a -f /etc/profile.d/lang.sh ; then - . /etc/profile.d/lang.sh - fi -else - readonly argv fi +readonly argv -# If LANG is still not set, get the system default locale settings: # -if test -z "$LANG" -a -f /etc/profile.d/lang.sh ; then - . /etc/profile.d/lang.sh +# If GDM had set GDM_LANG then override LANG: +# +if test -n "$GDM_LANG" ; then + LANG="$GDM_LANG" + export LANG + if test -n "$LC_ALL" ; then + test "$LC_ALL" = "$LANG" || LC_ALL="$LANG" + else + unset LC_ALL + fi + if test -n "$LANGUAGE" ; then + test "$LANGUAGE" = "$LANG" || LANGUAGE="$LANG" + else + unset LANGUAGE + fi + if test -n "$LINGUAS" ; then + test "$LINGUAS" = "$LANG" || LINGUAS="$LANG" + else + unset LINGUAS + fi fi # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
