Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package xdm for openSUSE:Factory checked in
at 2023-03-24 15:19:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xdm (Old)
and /work/SRC/openSUSE:Factory/.xdm.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xdm"
Fri Mar 24 15:19:06 2023 rev:99 rq:1073959 version:1.1.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/xdm/xdm.changes 2022-12-07 17:33:18.567995233
+0100
+++ /work/SRC/openSUSE:Factory/.xdm.new.31432/xdm.changes 2023-03-24
15:19:19.738546273 +0100
@@ -1,0 +2,24 @@
+Thu Mar 23 12:12:36 UTC 2023 - Stefan Dirsch <sndir...@suse.com>
+
+- No longer run "localectl set-x11-keymap ..." and only run
+ "localectl set-keymap ..." if XKBLAYOUT is not set, i.e. if
+ nobody was making use of "localectl set-x11-keymap" after
+ installation (boo#1209594, comment#24)
+
+-------------------------------------------------------------------
+Wed Mar 22 12:58:09 UTC 2023 - Stefan Dirsch <sndir...@suse.com>
+
+- keytable: exit 0 was executed too early, so
+ "localectl set-x11-keymap" wasn't executed; fixed this
+ (boo#1209594, comment#19)
+
+-------------------------------------------------------------------
+Wed Mar 22 10:58:41 UTC 2023 - Stefan Dirsch <sndir...@suse.com>
+
+- keytable: no longer ignore XKBLAYOUT (and XKBMODEL, XKBVARIANT,
+ XKBOPTIONS) variables if available in /etc/vconsole.conf, i.e.
+ no longer overwrite keyboard settings if anybody used
+ "localectl set-x11-keymap" himself; fixed "check systemd mapping"
+ if KEYMAP_TOGGLE has been set (boo#1209594)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xdm.spec ++++++
--- /var/tmp/diff_new_pack.aIfzj4/_old 2023-03-24 15:19:20.242548901 +0100
+++ /var/tmp/diff_new_pack.aIfzj4/_new 2023-03-24 15:19:20.246548922 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xdm
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
++++++ 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 2017-10-18 16:58:19.074036000 +0200
+++ new/etc/X11/xdm/keytable 2023-03-22 16:39:46.018654000 +0100
@@ -11,7 +11,7 @@
keyboard_map_systemd=/usr/share/systemd/kbd-model-map
function setkeyboard {
- echo "Command: localectl set-keymap $1"
+ echo "Command: localectl set-keymap $1 $2"
# xorg.conf.d snippet is only written if a valid snippet is already
# available, so create an us sample if neccessary
if [ ! -f $systemd_x11conf_file ]; then
@@ -28,7 +28,7 @@
echo "I: Using systemd $keyboard_map_systemd mapping"
fi
- localectl set-keymap $1
+ localectl set-keymap $1 $2
if [ -f $systemd_x11conf_file ]; then
if [ -f $previous_x11conf_file ]; then
if [ $systemd_x11conf_file -nt $previous_x11conf_file ]; then
@@ -45,9 +45,14 @@
echo "$vconsole_conf_file available"
. $vconsole_conf_file
if [ ! -z $KEYMAP ]; then
- echo "KEYMAP: $KEYMAP"
- options="$KEYMAP $KEYMAP_TOGGLE"
- setkeyboard "$options"
+ if [ -z $XKBLAYOUT ]; then
+ echo "KEYMAP: $KEYMAP"
+ setkeyboard $KEYMAP $KEYMAP_TOGGLE
+ else
+ echo "XKBLAYOUT: $XKBLAYOUT"
+ echo "XKBLAYOUT is already set. Better don't touch X11 keyboard
configuration."
+ exit 0
+ fi
else
echo "KEYMAP not set"
fi
