Hello community, here is the log from the commit of package xdm for openSUSE:12.2 checked in at 2012-07-02 11:20:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2/xdm (Old) and /work/SRC/openSUSE:12.2/.xdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:12.2/xdm/xdm.changes 2012-06-25 15:57:58.000000000 +0200 +++ /work/SRC/openSUSE:12.2/.xdm.new/xdm.changes 2012-07-02 11:20:48.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Jun 30 21:29:37 CEST 2012 - tiwai@suse.de + +- avoid plymouth quit for kdm and gdm (bnc#762909) + +------------------------------------------------------------------- +Fri Jun 29 16:23:12 CEST 2012 - tiwai@suse.de + +- remove --retain-splash option from plymouth quit (bnc#769209) + +------------------------------------------------------------------- +Fri Jun 29 14:11:47 UTC 2012 - sndirsch@suse.com + +- /etc/init.d/xdm + * quit plymouth properly before starting displaymanager + (bnc#769209) + +------------------------------------------------------------------- +Mon Jun 18 13:38:34 UTC 2012 - werner@suse.de + +- Skip LANG argument from command line of session managers (bnc#661946) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.spec ++++++ --- /var/tmp/diff_new_pack.9v7Oio/_old 2012-07-02 11:20:48.000000000 +0200 +++ /var/tmp/diff_new_pack.9v7Oio/_new 2012-07-02 11:20:48.000000000 +0200 @@ -21,10 +21,10 @@ Name: xdm Version: 1.1.10 Release: 0 -License: MIT Summary: X Display Manager -Url: http://xorg.freedesktop.org/ +License: MIT Group: System/X11/Utilities +Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.bz2 Source1: xdm.tar.bz2 Source2: HOWTO.xdm ++++++ 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 2010-12-03 18:42:07.000000000 +0100 +++ new/etc/X11/xdm/Xsession 2012-06-18 15:36:04.000000000 +0200 @@ -64,8 +64,6 @@ IFS="$OIFS" fi -readonly argv - # # Disable graphical login if normal login is disabled # @@ -170,7 +168,9 @@ *) forced=yes WINDOWMANAGER=${argv[0]} ;; esac - for l ; do + typeset -i argc=0 + for l in ${#argv[@]} ; do + let argc++ || : case "$l" in [a-z][a-z]_[A-Z][A-Z]*) LANG=$l @@ -178,11 +178,15 @@ 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 # If LANG is still not set, get the system default locale settings: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/init.d/xdm new/etc/init.d/xdm --- old/etc/init.d/xdm 2011-11-08 10:21:56.000000000 +0100 +++ new/etc/init.d/xdm 2012-07-01 09:47:02.000000000 +0200 @@ -200,6 +200,17 @@ rc_exit fi fi + case "$DM" in + kdm|gdm) + # KDE and GNOME have own plymouth integration + ;; + *) + if [ -x /usr/bin/plymouth ]; then + plymouth quit + plymouth --wait + fi + ;; + esac startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed # After a crash or a kill signal we may have # a wrong ownership of /dev/xconsole -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org