[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1012041: KeyboardNames.pl is out-of-sync with xkeyboard-config



Source: console-setup
Version: 1.205
Severity: normal

Problem symptom:
I was looking at "dpkg-reconfigure keyboard-configuration" under
Japanese locale and testing.  Although Generic 101 and 104 keyboards are
translated properly, Generic 102 and 105 keyboards were not translated
properly.

Resolution proposal:
Please place some kind of version skew avoidance measure by specifying
xkb-data as binary dependence with exact version value for
keyboard-configuration.  This dependency is because of gettext/po data
used.

Technical analysis:
As I looked into problem, kbdnames-maker + KeyboardNames.pl was using po
from xkeyboard-config:

  my $mo (</usr/share/locale/*/LC_MESSAGES/xkeyboard-config.mo>)

As I checked xkeyboard-config.po, its string obtained for msgid for 102
and 105 keyboards has been changed.  If we want to fix this issue,
KeyboardNames.pl needs to be updated at least:

```
$ diff -u KeyboardNames.pl.orig KeyboardNames.pl
--- KeyboardNames.pl.orig	2022-05-29 14:36:14.940304836 +0900
+++ KeyboardNames.pl	2022-05-29 15:02:29.524014093 +0900
@@ -71,10 +71,10 @@
     'FL90' => 'compalfl90',
     'Fujitsu-Siemens Amilo laptop' => 'fscaa1667g',
     'Generic 101-key PC' => 'pc101',
-    'Generic 102-key PC' => 'pc102',
+    'Generic 102-key (Intl) PC' => 'pc102',
     'Generic 104-key PC' => 'pc104',
     'Generic 104-key PC with L-shaped Enter key' => 'pc104alt',
-    'Generic 105-key PC' => 'pc105',
+    'Generic 105-key (Intl) PC' => 'pc105',
     'Generic 86-key PC' => 'pc86',
     'Genius Comfy KB-12e' => 'geniuscomfy',
     'Genius Comfy KB-16M/Multimedia KWD-910' => 'genius',
```

But this KeyboardNames.pl is a generated file so simple patch is not the
answer.  This file is generated by console-setup/Keyboard/Makefile .

Testing had old console-setup from Nov./2021 while xkb-data was updated
in April (testing migration on 2022-04-10)

Of course, console-setup 1.208 (uploaded to unstable on 2022-05-26)
solve the issue when it reaches testing in a few days this time. (But
this was broken for about a month unnoticed.)

It would be nice if we can avoid this version skew to happen in testing
by adding binary package dependency for PO file.

Regards,

Osamu


-- System Information:
Debian Release: bookworm/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 5.17.0-1-amd64 (SMP w/12 CPU threads; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages keyboard-configuration depends on:
ii  debconf                 1.5.79
ii  liblocale-gettext-perl  1.07-4+b2

Versions of packages console-setup-linux depends on:
ii  init-system-helpers     1.63
ii  kbd                     2.3.0-3
ii  keyboard-configuration  1.207

console-setup-linux suggests no packages.

Versions of packages console-setup is related to:
pn  console-common        <none>
pn  console-data          <none>
pn  console-tools         <none>
ii  gnome-control-center  1:42.1-2
ii  kbd                   2.3.0-3
ii  systemd               250.4-1


Reply to: