Bug#1113961: trixie-pu: package console-setup/1.240+deb13u1

[Samuel Thibault <sthibault@debian.org>]

Jonathan Wiltshire, le dim. 19 oct. 2025 13:48:57 +0100, a ecrit:
> On another note, does the duplicate CHANGES file add anything? If this is a
> native package anyway, surely debian/changelog is all that's needed?

It's actually a symlink to debian/changelog, which Anton added with a
"lintian cleaning" comment, but I don't see lintian complain about the
file missing. I have now dropped the link in master.

Cyril Brulebois wrote:
> The untrained eye might find dz(azerty-deadkeys) [templates]
> vs. dz(azerty-oss) [changelog] a little surprising though.

Oh.

I must have gotten confused by the upstream xkb change that yielded the
issue:

git show 022c3ca1db12e505cbd5ce8bf19c432d6a70c7e5
commit 022c3ca1db12e505cbd5ce8bf19c432d6a70c7e5
Author: ButterflyOfFire <butterflyoffire@protonmail.com>
Date:   Mon Mar 18 17:07:46 2024 +0000

    Correcting "la" to "kab"

diff --git a/rules/base.xml b/rules/base.xml
index 3785e412..20ee088f 100644
--- a/rules/base.xml
+++ b/rules/base.xml
@@ -1887,6 +1887,7 @@
         <languageList>
           <iso639Id>tzm</iso639Id>
           <iso639Id>fra</iso639Id>
+          <iso639Id>kab</iso639Id>
         </languageList>
       </configItem>
       <variantList>
diff --git a/symbols/dz b/symbols/dz
index 518abe24..f6c1160e 100644
--- a/symbols/dz
+++ b/symbols/dz
@@ -21,7 +21,7 @@
 // ┗━━━━━━━┻━━━━━━━┻━━━━━━━┹───────────────────────────────────┺━━━━━━━┻━━━━━━━┻━━━━━━━┛

 default partial alphanumeric_keys
-xkb_symbols "la" {
+xkb_symbols "azerty-oss" {

     include "fr(oss)"



It says it fixes la into kab (as in Kabyle), but dz(la) was referred to
in console-setup as being Berber, and in the xkb file we indeed have

xkb_symbols "azerty-oss" {

    include "fr(oss)"

    name[Group1]="Berber (Algeria, Latin)";

    key <AD02>  {[  z,  Z,  U1E93,  U1E92  ]}; // z Z ẓ Ẓ

U1E93 ẓ really is Berber, while


xkb_symbols "azerty-deadkeys" {

    include "fr"

    name[Group1]= "Kabyle (AZERTY, with dead keys)";

[...]
    key <AD02>  {[      z,     Z,      U2D63          ]}; // ⵣ

U+2D63 ⵣ really is Kabyle.

I guess the upstream commit got its comment confused but technically
it's azerty-oss which we should indeed be using for berber. Let me
upload 1.240+deb13u2 with this fixed.

Samuel