Timo Aaltonen pushed to branch debian-unstable at X Strike Force / data / xkeyboard-config
Commits: bc37c4ee by Pierre Le Marre at 2026-04-12T12:40:24+02:00 ci: Fix xkbcommon job xkbcommon has changed its meson build, which results in modified paths in the build directory. Fixed the path to the `xkeyboard-config-test` script. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/886> - - - - - 5da54c94 by Pierre Le Marre at 2026-04-12T13:32:07+02:00 inet: Update latest keysyms from xorgproto - `XF86ElectronicPrivacyScreenOn` - `XF86ElectronicPrivacyScreenOff` Relevant upstream merge request: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/109 Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/887> - - - - - 20054c5f by Alexandre Bouvier at 2026-04-12T13:37:34+02:00 ca(multix): Fixes to match the standard The Canadian CSA layout is the official keyboard layout of Canada (CAN/CSA Z243.200-92) and supports the whole ISO 6937 characters set, including ⅛ (U+215B) and đ (U+0111). These characters are in the secondary group 2b and are missing in the current implementation. Futhermore, according to the Outdated Common Secondary Group from ISO 9995-3:2010, the currency sign ¤, replaced by the euro symbol € in Level 6, E04, Gr2/Level-2 (AE04), is moved in Level-7 (Gr2/Level 3). Neither the ¤ and the € are in the primary group (Gr-1/Level 3) in the CAN/CSA Z243.200-92 standard. Changes: - Added `oneeighth` (U+215B) to `<AE02>` - Duplicated `currency` (U+00A4) on `<AE04>` - Added `dstroke` (U+0111) to `<AC04>` Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/882> - - - - - 743d4eea by Laitei at 2026-04-16T17:52:16+02:00 symbols: add Mara (mrh) keyboard layout Add a Mara (ISO 639-3: mrh) keyboard layout to xkeyboard-config. Includes: - Symbols definition - Layout registration for India and Myanmar - ISO 639 language metadata Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/877> - - - - - 8e119ec6 by Pierre Le Marre at 2026-04-22T06:59:15+00:00 keycodes: Add Linux 7.0 key Added the following keycodes to `evdev` - `<I604>` (Linux 7.0: `KEY_ACTION_ON_SELECTION`) - `<I605>` (Linux 7.0: `KEY_CONTEXTUAL_INSERT`) - `<I606>` (Linux 7.0: `KEY_CONTEXTUAL_QUERY`) Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/889> - - - - - d002692e by Pierre Le Marre at 2026-04-22T06:59:15+00:00 inet: Update latest keysyms from xorgproto - `XF86ActionOnSelection` - `XF86ContextualInsert` - `XF86ContextualQuery` Relevant upstream merge request: [xorgproto-112] [xorgproto-112]: https://gitlab.freedesktop.org/xorg/proto/xorgproto/-/merge_requests/112 Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/889> - - - - - 5a8080fa by Pierre Le Marre at 2026-04-27T15:35:53+02:00 vt(vt105): Fix <DELE> mapping `<DELE>` is mapped to `apLineDel`, but from the vt105 manual this should be just the standard `Delete`. This also fixes the last keysym that is not recognized by xkbcommon. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/891> - - - - - 37b175c2 by Pierre Le Marre at 2026-05-05T07:46:13+00:00 triage: Use bug report template by default Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/892> - - - - - 557c2f1b by Pierre Le Marre at 2026-05-05T07:46:13+00:00 triage: Improve issue & MR templates Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/892> - - - - - 665fe2fa by Pierre Le Marre at 2026-05-05T07:46:13+00:00 triage: Add bugbot tags to handle non-actionable reports Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/892> - - - - - 51178d63 by Pierre Le Marre at 2026-05-05T07:46:13+00:00 triage: Close stale “Needs information” report earlier Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/892> - - - - - a819182d by Pierre Le Marre at 2026-05-05T10:00:30+02:00 triage: Fix default issue template Gitlab does not handle symbolic links for the templates. Fixes regression from 37b175c222395b803c8ea938f7c78c4ff220117b Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/893> - - - - - 407b38b7 by Pierre Le Marre at 2026-05-05T10:13:11+02:00 triage: Fix tag addition Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/893> - - - - - c26ccd8d by Pierre Le Marre at 2026-05-12T18:20:22+00:00 rules: Add new generator Before this commit, the rules were generated by merging partial rules files `.part` (static and generated) in a very specific order. This is error prone: - It is not possible to have an overview of the rules structure: one must generate the whole file, making difficult to grasp the logic. - Some rules are repeated for various layout indices, but their consistency is not enforced. This commit introduces a new rules generator: - Use a single template file for all the rules. - Use layout ranges (`single`, `first`, `later`, `any`) instead of fixed layout indices, to avoid repetition. - Support legacy and modern rules syntax (see libxkbcommon documentation: https://xkbcommon.org/doc/current/rule-file-format.html#grammar This should facilitate backporting patches once we adopt the modern rules format and fork the code base. - Use a rules parser, making it possible to check for the validity of the MLVO and KcCGST components, respectively in the XML registries and the XKB files. - Automatically pretty-print the final file. A build option “new-rules-generator” is temporary introduced and will be removed in the next commit, in order to avoid a single gigantic commit. TODO: - [ ] Generate groups from the registries. Currently they are static entries in the template. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/859> - - - - - 643a7925 by Pierre Le Marre at 2026-05-12T18:20:22+00:00 rules: Remove old generator Make the new generator the default and remove the old generator files. Also remove the temporary build option “new-rules-generator”. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/859> - - - - - 99f5fb89 by Pierre Le Marre at 2026-05-12T18:20:22+00:00 build: Drop support for Python 3.9-3.10 Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/859> - - - - - ec605d97 by Kovács Viktor at 2026-05-12T18:25:19+00:00 Add Old Hung. Rudimenta UE to Carpth. Hl. variants On branch old_hun_carpathian Changes to be committed: modified: symbols/hu Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/890> - - - - - 38620860 by Lázaro Nixon at 2026-05-14T20:36:26+00:00 Add new layout for br thinkpad with nodeadkeys Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/868> - - - - - d4075677 by Sergey Udaltsov at 2026-05-14T23:31:26+00:00 prerelease for translation updates Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/894> - - - - - 79aa1104 by Pierre Le Marre at 2026-05-19T10:19:45+02:00 rules: Remove $nonlatin group The group `$nonlatin` is for compatibility on old systems but is inactive. It also has 2 issues: - It does not properly match the non-Latin layouts, since it does not involves the variant. See the `non-latin-layouts-list` build option to generate a list of all non-Latin layouts. - Its comment advise users to activate it by editing the system file, which is fragile as it must be done after each update of the xkeyboard-config package. As this convenience feature is both inactive and broken, let’s remove it: users should configure an *explicit* layout list. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/896> - - - - - 440f8f69 by Javier Mora at 2026-06-01T23:29:28+00:00 symbols/es: Better placement for dead_caron/doubleacute Move dead_caron to the same key as dead_circumflex in Spanish layout, since a caron is visually similar to a circumflex, but upside down. Move dead_doubleacute to the same key as dead_acute and dead_diaeresis, since a double acute is visually similar to an acute and a diaeresis (and semantically related to both, as it acts as an "acute umlaut"). Move dead_abovering to where dead_doubleacute was (Ntilde key). (This doesn't have any pros or cons over its current placement.) Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/767> - - - - - 94dc2fd8 by Pierre Le Marre at 2026-06-09T10:56:54+02:00 types: Fix default KEYPAD 3b6c73c0da5469e1be47286dca591777c916fa93 removed: map[Shift] = Level2; but left: map[Shift+NumLock] = Level1; This is counter-intuitive due to the asymmetry: `Shift` does not switch to Level2 while still “cancelling” `NumLock`. It also disables the possibility to use `Shift` + numpad number in shortcuts. Removed `Shift` from the key type `KEYPAD`, so that only `NumLock` affects it. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/898> - - - - - d6d402e4 by Pierre Le Marre at 2026-06-09T10:57:05+02:00 types: Make numpad(microsoft) an alias of numpad(pc) They are basically the same type with the combination of the previous commit and 3b6c73c0da5469e1be47286dca591777c916fa93. Note: this type is currently not used in the project; keeping it for now for compatibility. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/898> - - - - - 49f52f98 by Pierre Le Marre at 2026-06-09T11:17:50+02:00 types: Fix FOUR_LEVEL_X and numpad(shift3) Fix missing `map` and `preserve` entries. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/898> - - - - - 45fa5c59 by Pierre Le Marre at 2026-06-09T11:19:44+02:00 types: Fix pc(default) - PC_SHIFT_SUPER_LEVEL2: Fix missing `preserve` entries. - CTRL+ALT: Fix erroneous preserve entries with `Shift`. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/898> - - - - - 74f6a2cf by Pierre Le Marre at 2026-06-09T19:51:18+00:00 types: Fix FOUR_LEVEL_KEYPAD and FOUR_LEVEL_MIXED_KEYPAD Follow-up of 3b6c73c0da5469e1be47286dca591777c916fa93. numpad key types: Changed `FOUR_LEVEL_KEYPAD` and `FOUR_LEVEL_MIXED_KEYPAD` so that they are identical and enable to use `Shift` in keyboard shortcuts with *both* arrows/edition keys and numbers: - `Shift` maps to level 1, usually corresponding to numpad `KP_` arrows/editing keysyms variants); - `Shift` is preserved. - No “`Shift` cancels `NumLock`” behavior. All numpad key types have now the same consistent behavior with `Shift` and `NumLock`. This a *breaking* change. Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/899> - - - - - 7c0159cd by Pierre Le Marre at 2026-06-09T22:07:48+02:00 types: Fix typo Follow-up of 74f6a2cf52de06ec10eb6f70ff9a1d6c81bee299 Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/901> - - - - - be285e91 by Pierre Le Marre at 2026-06-16T20:10:56+00:00 chore: Remove spaces before `xkb_symbols` Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/905> - - - - - c41271fe by Aria Węgrzyn at 2026-06-20T23:53:21+00:00 symbols/pl: add colemak_dh_ortho variant Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/885> - - - - - 0f4beaf2 by Sergey Udaltsov at 2026-06-21T00:13:45+00:00 updated translations Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/906> - - - - - 442d2491 by Sergey Udaltsov at 2026-06-21T00:26:25+00:00 removed whitespace Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/906> - - - - - cf8d1151 by Sergey Udaltsov at 2026-06-21T00:53:29+00:00 release 2.48 Part-of: <https://gitlab.freedesktop.org/xkeyboard-config/xkeyboard-config/-/merge_requests/907> - - - - - e23f5f5a by Timo Aaltonen at 2026-08-05T10:37:58+03:00 control: Add Conflicts on keyboards-rg (Closes: #1133239) - - - - - 533546ae by Timo Aaltonen at 2026-08-05T10:38:17+03:00 Merge branch 'upstream-unstable' into debian-unstable - - - - - ee163caf by Timo Aaltonen at 2026-08-05T10:38:47+03:00 version bump - - - - - c2a9a23e by Timo Aaltonen at 2026-08-05T10:41:23+03:00 releasing package xkeyboard-config version 2.48-1 - - - - - 160 changed files: - .gitlab-ci.yml - .gitlab-ci/triage-policies-stale.yml - − .gitlab/issue_templates/Bug.md - .gitlab/issue_templates/Default.md - .gitlab/issue_templates/Feature Request.md - .gitlab/merge_request_templates/Bug Fix.md - .gitlab/merge_request_templates/Default.md - .gitlab/merge_request_templates/New Layout.md - .triage-policies.yml - ChangeLog.md - + changes/misc/+evdev-keycodes.features.md - debian/changelog - debian/control - docs/iso639.csv - keycodes/evdev - meson.build - po/ar.po - po/bg.po - po/ca.po - po/cs.po - po/de.po - po/fi.po - po/fr.po - po/he.po - po/id.po - po/ka.po - + po/kk.po - po/ko.po - po/pl.po - po/pt.po - po/ro.po - po/sl.po - po/sr.po - po/sv.po - po/tr.po - po/uk.po - po/xkeyboard-config.pot - po/zh_CN.po - − rules/0000-hdr.part - − rules/0010-lists.part - − rules/0020-base.lists.part - − rules/0020-evdev.lists.part - − rules/0040-base.model_keycodes.part - − rules/0040-evdev.model_keycodes.part - − rules/0050-layout1_keycodes.part - − rules/0060-layout_keycodes.part - − rules/0070-options_keycodes.part - − rules/0080-modellayout_geometry.part - − rules/0090-model_geometry.part - − rules/0130-modellayout_symbols.part - − rules/0160-modellayout1_symbols.part - − rules/0180-modellayout2_symbols.part - − rules/0200-modellayout3_symbols.part - − rules/0220-modellayout4_symbols.part - − rules/0260-base.model_symbols.part - − rules/0260-evdev.model_symbols.part - − rules/0270-base.modellayout_symbols1.part - − rules/0270-evdev.modellayout_symbols1.part - − rules/0330-modellayout_compat.part - − rules/0340-modellayout1_compat.part - − rules/0341-modellayout2_compat.part - − rules/0342-modellayout3_compat.part - − rules/0343-modellayout4_compat.part - − rules/0350-model_types.part - − rules/0360-layoutoption_symbols.part - − rules/0370-layout1option_symbols.part - − rules/0380-layout2option_symbols.part - − rules/0390-layout3option_symbols.part - − rules/0400-layout4option_symbols.part - rules/base.extras.xml - rules/base.xml - − rules/compat/.gitignore - − rules/compat/0280-layoutvariant_compat.part - − rules/compat/0290-layout1variant1_compat.part - − rules/compat/0300-layout2variant2_compat.part - − rules/compat/0310-layout3variant3_compat.part - − rules/compat/0320-layout4variant4_compat.part - − rules/compat/0410-option_symbols.part - − rules/compat/map-variants.py - − rules/compat/meson.build - − rules/generate-options-symbols.py - + rules/generator/__init__.py - + rules/generator/__main__.py - + rules/generator/compatibility.py - + rules/generator/options.py - + rules/generator/parser.py - + rules/generator/registry.py - + rules/generator/template.py - − rules/merge.py - rules/meson.build - + rules/rules.in - symbols/ara - symbols/be - symbols/br - symbols/ca - symbols/ch - symbols/cz - symbols/de - symbols/digital_vndr/vt - symbols/dk - symbols/ee - symbols/es - symbols/fr - symbols/gb - symbols/gr - symbols/hu - symbols/in - symbols/inet - symbols/it - symbols/jp - symbols/kr - symbols/lt - symbols/lv - symbols/meson.build - symbols/mm - symbols/nl - symbols/no - symbols/pl - symbols/pt - symbols/ru - symbols/se - symbols/sk - symbols/sun_vndr/ara - symbols/sun_vndr/be - symbols/sun_vndr/br - symbols/sun_vndr/ca - symbols/sun_vndr/ch - symbols/sun_vndr/cz - symbols/sun_vndr/de - symbols/sun_vndr/dk - symbols/sun_vndr/ee - symbols/sun_vndr/es - symbols/sun_vndr/fr - symbols/sun_vndr/gb - symbols/sun_vndr/gr - symbols/sun_vndr/it - symbols/sun_vndr/jp - symbols/sun_vndr/kr - symbols/sun_vndr/lt - symbols/sun_vndr/lv - symbols/sun_vndr/nl - symbols/sun_vndr/no - symbols/sun_vndr/pl - symbols/sun_vndr/pt - symbols/sun_vndr/ru - symbols/sun_vndr/se - symbols/sun_vndr/sk - symbols/sun_vndr/tr - symbols/sun_vndr/tw - symbols/sun_vndr/ua - symbols/sun_vndr/us - symbols/tr - symbols/tw - symbols/ua - symbols/us - + tests/test_rules_generator.py - tests/xkbcommon/__init__.py - types/extra - types/numpad - types/pc The diff was not included because it is too large. View it on GitLab: https://salsa.debian.org/xorg-team/data/xkeyboard-config/-/compare/2079dea676e9b32c5856977e19aa6d36e441bfc2...c2a9a23e93af2d59cd5fc968f74c4d6b50b4b7c1 -- View it on GitLab: https://salsa.debian.org/xorg-team/data/xkeyboard-config/-/compare/2079dea676e9b32c5856977e19aa6d36e441bfc2...c2a9a23e93af2d59cd5fc968f74c4d6b50b4b7c1 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
