Hello community, here is the log from the commit of package xinit for openSUSE:Factory checked in at 2013-09-17 15:05:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xinit (Old) and /work/SRC/openSUSE:Factory/.xinit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xinit" Changes: -------- --- /work/SRC/openSUSE:Factory/xinit/xinit.changes 2013-09-13 14:47:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xinit.new/xinit.changes 2013-09-17 15:05:53.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 16 15:09:42 UTC 2013 - [email protected] + +- fixed loading of .xkb files (bnc#840408) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xinit.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xinit/xinitrc.common new/etc/X11/xinit/xinitrc.common --- old/etc/X11/xinit/xinitrc.common 2012-12-05 10:27:13.000000000 +0100 +++ new/etc/X11/xinit/xinitrc.common 2013-09-16 16:39:49.000000000 +0200 @@ -125,13 +125,20 @@ fi # -# Handle the the users Xmodmap or Xkbmap. +# Handle system's and/or user's Xkbmap (x)or user's Xmodmap. # Note that xkb and xmodmap should not be mixed. +# Priority: 1. User's xkb -> 2. User's xmodmap -> 3. System's xkb # -if test -s $XETCDIR/Xkbmap ; then - test -r "$xkbmap" && cat "$xkbmap" | setxkbmap -else +if test -s "$xkbmap" ; then + # apply system's xkb first + if test -s $XETCDIR/Xkbmap; then + test -r $XETCDIR/Xkbmap && cat $XETCDIR/Xkbmap | xkbcomp - $DISPLAY + fi + test -r "$xkbmap" && cat "$xkbmap" | xkbcomp - $DISPLAY +elif test -s "$xmodmap"; then test -r "$xmodmap" && xmodmap "$xmodmap" +elif test -s $XETCDIR/Xkbmap ; then + test -r $XETCDIR/Xkbmap && cat $XETCDIR/Xkbmap | xkbcomp - $DISPLAY fi # -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
