Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Mon Dec 21 23:16:40 CET 2009. -------- --- xorg-x11/xorg-x11.changes 2009-12-14 23:17:06.000000000 +0100 +++ xorg-x11/xorg-x11.changes 2009-12-18 23:37:36.000000000 +0100 @@ -1,0 +2,7 @@ +Fri Dec 18 23:33:51 CET 2009 - sndirsch@suse.de + +- /etc/init.d/xdm: added support for entrance (E17) login manager; + add this option also to /etc/sysconfig/displaymanger:DISPLAYMANAGER + (bnc #565583) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11.spec ++++++ --- /var/tmp/diff_new_pack.uHN5Ua/_old 2009-12-21 23:15:33.000000000 +0100 +++ /var/tmp/diff_new_pack.uHN5Ua/_new 2009-12-21 23:15:33.000000000 +0100 @@ -26,7 +26,7 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.4 -Release: 40 +Release: 41 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Utilities ++++++ xdm.tar.bz2 ++++++ 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 2009-10-24 19:26:33.000000000 +0200 +++ new/etc/init.d/xdm 2009-12-18 23:27:37.000000000 +0100 @@ -69,6 +69,7 @@ GDM_PIDFILE="/var/run/gdm.pid" SLIM_PIDFILE="/var/run/slim.lock" LXDM_PIDFILE="/var/run/lxdm.pid" +ENTRANCE_PIDFILE="/var/run/entrance.pid" PIDFILE=$XDM_PIDFILE KDEROOTHOME=/root/.kdm export KDEROOTHOME @@ -88,6 +89,7 @@ WDM_BIN=/usr/bin/wdm SLIM_BIN=/usr/bin/slim LXDM_BIN=/usr/bin/lxdm +ENTRANCE_BIN=/usr/sbin/entranced RELOADSIGNAL="-HUP" DM=${DISPLAYMANAGER##*/} @@ -121,6 +123,10 @@ XDMOPTIONS=-d PIDFILE=$LXDM_PIDFILE ;; + entrance) + DISPLAYMANAGER=$ENTRANCE_BIN + PIDFILE=$ENTRANCE_PIDFILE + ;; console) exit 0 ;; *) DISPLAYMANAGER=$XDM_BIN @@ -145,10 +151,13 @@ /sbin/checkproc -p $KDM_PIDFILE $KDM4_BIN && rc_exit 0 elif [ "$DISPLAYMANAGER" = "$GDM_BIN" -a -s $GDM_PIDFILE ]; then /sbin/checkproc -p $GDM_PIDFILE $GDM_BIN && rc_exit 0 + elif [ "$DISPLAYMANAGER" = "$ENTRANCE_BIN" -a -s $ENTRANCE_PIDFILE ]; then + /sbin/checkproc -p $ENTRANCE_PIDFILE $ENTRANCE_BIN && rc_exit 0 fi if [ "$DISPLAYMANAGER" != "$KDM_BIN" -a \ "$DISPLAYMANAGER" != "$KDM4_BIN" -a \ + "$DISPLAYMANAGER" != "$ENTRANCE_BIN" -a \ "$DISPLAYMANAGER" != "$GDM_BIN" ]; then test -x /etc/X11/xdm/SuSEconfig.xdm && \ MD5DIR="/var/adm/SuSEconfig/md5" \ @@ -233,6 +242,8 @@ PIDFILE=$SLIM_PIDFILE elif test -s "$LXDM_PIDFILE"; then PIDFILE=$LXDM_PIDFILE + elif test -s "$ENTRANCE_PIDFILE"; then + PIDFILE=$ENTRANCE_PIDFILE fi if test -s $PIDFILE; then read -t 1 PID < $PIDFILE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/var/adm/fillup-templates/sysconfig.displaymanager new/var/adm/fillup-templates/sysconfig.displaymanager --- old/var/adm/fillup-templates/sysconfig.displaymanager 2008-08-09 12:28:40.000000000 +0200 +++ new/var/adm/fillup-templates/sysconfig.displaymanager 2009-12-18 23:33:17.000000000 +0100 @@ -1,10 +1,10 @@ ## Path: Desktop/Display manager ## Description: settings to generate a proper displaymanager config -## Type: string(kdm,kdm3,kdm4,xdm,gdm,wdm,console) +## Type: string(kdm,kdm3,kdm4,xdm,gdm,wdm,entrance,console) ## Default: "" # -# Here you can set the default Display manager (kdm/xdm/gdm/wdm/console). +# Here you can set the default Display manager (kdm/xdm/gdm/wdm/entrance/console). # all changes in this file require a restart of the displaymanager # DISPLAYMANAGER="" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org