Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2013-09-17 15:04:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-08-23 11:08:54.000000000
+0200
+++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2013-09-17
15:04:49.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Sep 16 19:17:39 UTC 2013 - sndir...@suse.com
+
+- fixed typo in /etc/X11/xdm/Xsetup
+
+-------------------------------------------------------------------
+Mon Sep 16 11:38:10 UTC 2013 - sndir...@suse.com
+
+- fixed loading of .xkb files (bnc#840408)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xdm/RunChooser new/etc/X11/xdm/RunChooser
--- old/etc/X11/xdm/RunChooser 2006-08-22 16:20:19.000000000 +0200
+++ new/etc/X11/xdm/RunChooser 2013-09-16 13:33:27.000000000 +0200
@@ -50,7 +50,8 @@
hostxkbmap=${ETCDIR}/Xkbmap.${DISPLAY%:*}
xset=${BINDIR}/xset
xmodmap=${BINDIR}/xmodmap
- xkbmap=${BINDIR}/xkbmap
+ xkbmap=${BINDIR}/setxkbmap
+ xkbcomp=${BINDIR}/xkbcomp
xpmroot=${BINDIR}/xpmroot
xsetroot=${BINDIR}/xsetroot
kdmdesktop=/opt/kde/bin/kdmdesktop
@@ -97,23 +98,23 @@
#
# Set keymap for various displays
#
-if test -x $xmodmap -o -x $xkbmap ; then
+if test -x $xmodmap -o -x $xkbcomp ; then
if test -z "${DISPLAY%:*}" ; then
# local connection
- if test -s $sysxkbmap -a -x $xkbmap ; then
- cat $sysxkbmap | $xkbmap
+ if test -s $sysxkbmap -a -x $xkbcomp ; then
+ cat $sysxkbmap | $xkbcomp - $DISPLAY
elif test -r $sysmodmap ; then
$xmodmap $sysmodmap
fi
else
# TCP/IP connection (remote or local)
- if test -s $defxkbmap -a -x $xkbmap ; then
- cat $defxkbmap | $xkbmap
+ if test -s $defxkbmap -a -x $xkbcomp ; then
+ cat $defxkbmap | $xkbcomp - $DISPLAY
elif test -r $defmodmap ; then
$xmodmap $defmodmap
fi
- if test -s $hostxkbmap -a -x $xkbmap ; then
- cat $hostxkbmap | $xkbmap
+ if test -s $hostxkbmap -a -x $xkbcomp ; then
+ cat $hostxkbmap | $xkbcomp - $DISPLAY
elif test -r $hostmodmap ; then
$xmodmap $hostmodmap
fi
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 2011-10-11 15:42:22.000000000 +0200
+++ new/etc/X11/xdm/Xsetup 2013-09-16 21:17:05.000000000 +0200
@@ -59,6 +59,7 @@
xset=${BINDIR}/xset
xmodmap=${BINDIR}/xmodmap
xkbmap=${BINDIR}/setxkbmap
+ xkbcomp=${BINDIR}/xkbcomp
xpmroot=${BINDIR}/xpmroot
xsetroot=${BINDIR}/xsetroot
xconsole=${BINDIR}/xconsole
@@ -192,23 +193,23 @@
#
# Set keymap for various displays
#
-if test -x $xmodmap -o -x $xkbmap ; then
+if test -x $xmodmap -o -x $xkbcomp ; then
if test -z "${DISPLAY%:*}" ; then
# local connection
- if test -s $sysxkbmap -a -x $xkbmap ; then
- cat $sysxkbmap | $xkbmap
+ if test -s $sysxkbmap -a -x $xkbcomp ; then
+ cat $sysxkbmap | $xkbcomp - $DISPLAY
elif test -r $sysmodmap ; then
$xmodmap $sysmodmap
fi
else
# TCP/IP connection (remote or local)
- if test -s $defxkbmap -a -x $xkbmap ; then
- cat $defxkbmap | $xkbmap
+ if test -s $defxkbmap -a -x $xkbcomp ; then
+ cat $defxkbmap | $xkbcomp - $DISPLAY
elif test -r $defmodmap ; then
$xmodmap $defmodmap
fi
- if test -s $hostxkbmap -a -x $xkbmap ; then
- cat $hostxkbmap | $xkbmap
+ if test -s $hostxkbmap -a -x $xkbcomp ; then
+ cat $hostxkbmap | $xkbcomp - $DISPLAY
elif test -r $hostmodmap ; then
$xmodmap $hostmodmap
fi
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
