Hello community, here is the log from the commit of package xdm for openSUSE:Factory checked in at 2015-01-22 21:48:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-12-22 12:52:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xdm.new/xdm.changes 2015-01-22 21:48:48.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Jan 18 11:37:29 UTC 2015 - [email protected] + +- Don't truncate filenames of lt.baltic.map.gz, lt.std.map.gz, + lt.l4.map.gz and defkeymap_V1.0 too much (bnc#897803). + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xdm.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/etc/X11/xdm/keytable new/etc/X11/xdm/keytable --- old/etc/X11/xdm/keytable 2014-03-04 13:53:31.000000000 +0100 +++ new/etc/X11/xdm/keytable 2015-01-19 23:56:09.000000000 +0100 @@ -9,6 +9,7 @@ sysconfig_file=/etc/sysconfig/keyboard previous_x11conf_file=/etc/X11/xorg.conf.d/90-keytable.conf systemd_x11conf_file=/etc/X11/xorg.conf.d/00-keyboard.conf +keyboard_map_systemd=/usr/share/systemd/kbd-model-map function setkeyboard { echo "Command: localectl set-keymap $1" @@ -17,6 +18,17 @@ if [ ! -f $systemd_x11conf_file ]; then localectl set-x11-keymap us fi + + # check systemd mapping + NEWKEYMAP=$(echo "$1" | sed "s/ $//" ) + opts=$(grep -P "^$NEWKEYMAP\t" "$keyboard_map_systemd" | sed -re "s/[^\t]*//" -e "s/[\t]+/ /g" ) + if [ -z "$opts" ]; then + echo "W: Can not found mapping for $NEWKEYMAP in $keyboard_map_systemd" + echo "W: Please report bug of systemd." + else + echo "I: Using systemd $keyboard_map_systemd mapping" + fi + localectl set-keymap $1 if [ -f $systemd_x11conf_file ]; then if [ $systemd_x11conf_file -nt $previous_x11conf_file ]; then @@ -46,7 +58,11 @@ echo "$sysconfig_file available" . $sysconfig_file if [ ! -z $KEYTABLE ]; then - KEYTABLE=${KEYTABLE%%.*} + # KEYTABLE=${KEYTABLE%%.*} can not be used, because + # lt.baltic.map.gz, lt.std.map.gz, lt.l4.map.gz + # and defkeymap_V1.0 have dot before .map.gz + KEYTABLE=${KEYTABLE%.gz} + KEYTABLE=${KEYTABLE%.map} echo "KEYTABLE: $KEYTABLE" options="$KEYTABLE" setkeyboard "$options" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/usr/sbin/rcxdm new/usr/sbin/rcxdm --- old/usr/sbin/rcxdm 2015-01-22 21:48:49.000000000 +0100 +++ new/usr/sbin/rcxdm 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -symbolic link to /etc/init.d/xdm -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
