commit xorg-x11 for openSUSE:Factory
Hello community, here is the log from the commit of package xorg-x11 for openSUSE:Factory checked in at Wed Oct 12 16:18:06 CEST 2011. -------- --- openSUSE:Factory/xorg-x11/xorg-x11.changes 2011-09-28 15:36:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11/xorg-x11.changes 2011-10-11 16:14:19.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Oct 11 13:45:11 UTC 2011 - gber@opensuse.org + +- xdm.tar.bz2: + commented out Tablet PC detection code in /etc/X11/xdm/Xsetup and + /etc/X11/xdm/Xstartup which relied on hal-find-by-property + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xsetup new/etc/X11/xdm/Xsetup --- old/etc/X11/xdm/Xsetup 2010-09-02 02:06:18.000000000 +0200 +++ new/etc/X11/xdm/Xsetup 2011-10-11 15:42:22.000000000 +0200 @@ -65,7 +65,7 @@ xmessage=${BINDIR}/xmessage xrdb=${BINDIR}/xrdb backprg=${BINDIR}/BackGround - halporp=/usr/bin/hal-find-by-property +# halporp=/usr/bin/hal-find-by-property xvkbd=${BINDIR}/xvkbd xvkbdargs="-compact -geometry -0-0 -xdm -always-on-top -keyfile /usr/share/X11/app-defaults/xvkbd.default" @@ -111,19 +111,19 @@ # Check if the machine is a TabletPC and start # xvkbd in xdm do be able to input username and password # -$halporp --key system.formfactor.subtype --string tabletpc -if test $? -eq 0 -a -x $xvkbd ; then - # Bug 149957, Bug #408736 - ( declare -i t=100 - while test $((t--)) -gt 0 ; do - case "$(xwininfo -root -children)" in - *greet*|xlogin) break ;; - esac - sleep 0.1 - done - HOME=/root exec $xvkbd $xvkbdargs - ) & echo $! > /var/run/xvkbd.pid -fi +#$halporp --key system.formfactor.subtype --string tabletpc +#if test $? -eq 0 -a -x $xvkbd ; then +# # Bug 149957, Bug #408736 +# ( declare -i t=100 +# while test $((t--)) -gt 0 ; do +# case "$(xwininfo -root -children)" in +# *greet*|xlogin) break ;; +# esac +# sleep 0.1 +# done +# HOME=/root exec $xvkbd $xvkbdargs +# ) & echo $! > /var/run/xvkbd.pid +#fi # # Handle background: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/Xstartup new/etc/X11/xdm/Xstartup --- old/etc/X11/xdm/Xstartup 2009-07-24 15:30:35.000000000 +0200 +++ new/etc/X11/xdm/Xstartup 2011-10-11 15:42:55.000000000 +0200 @@ -14,7 +14,7 @@ BINDIR=/usr/bin xmessage=${BINDIR}/xmessage NOLOGIN=/etc/nologin - halporp=/usr/bin/hal-find-by-property +# halporp=/usr/bin/hal-find-by-property xvkbd=${BINDIR}/xvkbd kvkbd=${BINDIR}/kvkbd xsetup=${XDMDIR}/Xsetup @@ -27,15 +27,15 @@ # Check if the machine is a TabletPC and kill xvkbd # to avoid multiple start on user desktop # -$halporp --key system.formfactor.subtype --string tabletpc -if test $? -eq 0 -a -x $xvkbd ; then - /sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd - # in case it's actually kvkbd - /sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd - # Bug #408736 - # in case xvkbd hasn't been started by the Xsetup subshell yet - /sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup -fi +#$halporp --key system.formfactor.subtype --string tabletpc +#if test $? -eq 0 -a -x $xvkbd ; then +# /sbin/killproc -p /var/run/xvkbd.pid -TERM $xvkbd +# # in case it's actually kvkbd +# /sbin/killproc -p /var/run/xvkbd.pid -TERM $kvkbd +# # Bug #408736 +# # in case xvkbd hasn't been started by the Xsetup subshell yet +# /sbin/killproc -p /var/run/xvkbd.pid -TERM $xsetup +#fi # # The real user id continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de