Merge 2.7.1-2 into plucky
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| kbd (Ubuntu) |
Fix Released
|
Medium
|
Graham Inggs | ||
Bug Description
tracking bug
Ubuntu plucky: 2.6.4-2ubuntu3
Debian unstable: 2.7.1-2
### New Debian Changes ###
kbd (2.7.1-2) unstable; urgency=medium
* Team upload.
* Add debian/
-- Andreas Henriksson <email address hidden> Fri, 20 Dec 2024 20:11:27 +0100
kbd (2.7.1-1) unstable; urgency=medium
* Team upload.
* New upstream release.
* Upload to unstable.
-- Andreas Henriksson <email address hidden> Fri, 20 Dec 2024 11:40:06 +0100
kbd (2.7~rc1-1) experimental; urgency=medium
* Team upload.
* debian/watch: Mangle rc versions to ~rc
* debian/gbp: Rename branches to /latest according to DEP14
* New upstream release candidate.
* Upload to experimental.
* Update Misc...patch to apply
* Revert "Cherry-pick patches from upstream fixing gcc14 FTBFS"
* debian/kbd.docs: Drop outdated docs removed upstream
* debian/copyright: Update renamed files
-- Andreas Henriksson <email address hidden> Mon, 18 Nov 2024 20:08:52 +0100
kbd (2.6.4-3) unstable; urgency=medium
* Team upload.
* Cherry-pick patches from upstream fixing gcc14 FTBFS (Closes: #1075109)
* Build-dep on pkgconf instead of pkg-config
-- Andreas Henriksson <email address hidden> Tue, 24 Sep 2024 03:12:26 +0200
### Old Ubuntu Delta ###
kbd (2.6.4-2ubuntu3) oracular; urgency=medium
* d/p/Add-
(LP: #2081329).
-- Zixing Liu <email address hidden> Thu, 19 Sep 2024 11:27:01 -0600
kbd (2.6.4-2ubuntu2) noble; urgency=medium
* No-change rebuild for CVE-2024-3094
-- Steve Langasek <email address hidden> Sun, 31 Mar 2024 09:02:08 +0000
kbd (2.6.4-2ubuntu1) noble; urgency=medium
* Merge with Debian unstable (LP: #2055065). Remaining changes:
- Add setfont, kbd_mode, and loadkeys to initramfs for console-setup.
- Use ckbcomp to get the keyboard layout if other data files are not
available.
- Change loadkeys to find any console not in raw mode when invoked
without an explicit console parameter, in case the foreground console
is in raw mode.
- debian/control: Depend on console-setup | console-setup-mini, since
console-
- Add setvtrgb to kbd-udeb (LP #730672).
* Dropped unnecessary changelog entries
- Added initramfs hook to have setfont/loadkeys available in initramfs.
+ This is basically a duplicate of:
Add setfont, kbd_mode, and loadkeys to initramfs for console-setup.
- debian/
argument to ioctl(..., KDGKBMODE), which causes consoles to not be
correctly detected on 64-bit archs. LP #1621824.
+ This was a bug in an Ubuntu-specific patch so irrelevant to our delta
with Debian.
- Fix incorrect keymap sanity check in loadkeys_
+ This was a bug in an Ubuntu-specific patch so irrelevant to our delta
with Debian.
-- Olivier Gayot <email address hidden> Tue, 27 Feb 2024 10:52:03 +0100
----
Nothing big expected, just a merge.
Related branches
- Graham Inggs (community): Approve
- git-ubuntu import: Pending requested
-
Diff: 1034 lines (+784/-27)8 files modifieddebian/changelog (+543/-22)
debian/control (+4/-3)
debian/kbd.dirs (+1/-0)
debian/kbd.initramfs-hook (+23/-0)
debian/patches/loadkeys_ckbcomp.diff (+111/-0)
debian/patches/loadkeys_find_usable_console.diff (+96/-0)
debian/patches/series (+2/-0)
debian/rules (+4/-2)
- Ubuntu Sponsors: Pending requested
- git-ubuntu import: Pending requested
-
Diff: 79704 lines (+20728/-12334) (has conflicts)224 files modified.github/workflows/ci.yml (+4/-4)
.gitignore (+3/-0)
INSTALL (+237/-240)
Makefile.am (+10/-1)
Makefile.common (+46/-0)
README.md (+5/-5)
autogen.sh (+1/-1)
configure.ac (+84/-29)
contrib/codepage.c (+5/-1)
contrib/gen_compile_commands (+130/-0)
contrib/splitfont.c (+2/-0)
data/Makefile.am (+44/-29)
data/consolefonts/README.Ethiopic (+0/-5)
data/keymaps/i386/colemak/mod-dh-ansi-us-awing.map (+2/-2)
data/keymaps/i386/colemak/mod-dh-ansi-us-fatz-wide.map (+4/-4)
data/keymaps/i386/colemak/mod-dh-ansi-us-fatz.map (+2/-2)
data/keymaps/i386/colemak/mod-dh-ansi-us-wide.map (+4/-4)
data/keymaps/i386/colemak/mod-dh-ansi-us.map (+2/-2)
data/keymaps/i386/colemak/mod-dh-iso-uk-wide.map (+6/-6)
data/keymaps/i386/colemak/mod-dh-iso-uk.map (+2/-2)
data/keymaps/i386/colemak/mod-dh-iso-us-wide.map (+6/-6)
data/keymaps/i386/colemak/mod-dh-iso-us.map (+2/-2)
data/keymaps/i386/colemak/mod-dh-matrix-us.map (+2/-2)
data/keymaps/i386/hcesar/hcesar.map (+99/-0)
data/keymaps/i386/qwerty/sv-latin1.map (+1/-0)
debian/changelog (+57/-0)
debian/control (+1/-1)
debian/copyright (+5/-5)
debian/gbp.conf (+2/-2)
debian/kbd.docs (+0/-2)
debian/patches/Miscellaneous-manpage-corrections-and-additions.patch (+84/-84)
debian/patches/loadkeys_ckbcomp.diff (+13/-0)
debian/patches/loadkeys_find_usable_console.diff (+11/-0)
debian/patches/ppc-keycode0-test.patch (+30/-0)
debian/patches/series (+6/-0)
debian/watch (+3/-2)
dev/null (+0/-53)
docs/man/man1/Makefile.am (+3/-6)
docs/man/man1/chvt.1 (+14/-6)
docs/man/man1/deallocvt.1 (+10/-5)
docs/man/man1/dumpkeys.1.gen (+1/-1)
docs/man/man1/fgconsole.1 (+21/-21)
docs/man/man1/kbd_mode.1 (+2/-0)
docs/man/man1/kbdinfo.1 (+2/-2)
docs/man/man1/loadkeys.1.gen (+6/-6)
docs/man/man1/openvt.1 (+14/-13)
docs/man/man1/setleds.1 (+2/-0)
docs/man/man1/setmetamode.1 (+4/-2)
docs/man/man1/showkey.1 (+2/-0)
docs/man/man1/unicode_start.1 (+2/-0)
docs/man/man1/unicode_stop.1 (+2/-0)
docs/man/man1/vlock.1 (+5/-1)
docs/man/man1misc/codepage.1 (+6/-6)
docs/man/man1misc/screendump.1 (+16/-9)
docs/man/man5/keymaps.5 (+3/-0)
docs/man/man8/Makefile.am (+3/-6)
docs/man/man8/getkeycodes.8 (+7/-1)
docs/man/man8/loadunimap.8.gen (+21/-17)
docs/man/man8/mapscrn.8.gen (+18/-9)
docs/man/man8/setfont.8.gen (+38/-27)
docs/man/man8/setkeycodes.8 (+11/-2)
docs/man/man8/setvtrgb.8 (+2/-2)
docs/man/man8/showconsolefont.8 (+20/-18)
docs/man/man8misc/clrunimap.8 (+13/-1)
docs/man/man8misc/getunimap.8 (+19/-5)
docs/man/man8misc/mk_modmap.8 (+8/-6)
docs/man/man8misc/setlogcons.8 (+15/-3)
docs/man/man8misc/setvesablank.8 (+5/-4)
docs/man/man8misc/vcstime.8 (+1/-1)
docs/process/howto-contribute.md (+5/-5)
docs/process/programming-language.md (+34/-0)
po/POTFILES.in (+1/-2)
po/cs.po (+535/-442)
po/da.po (+576/-434)
po/de.po (+517/-434)
po/el.po (+515/-436)
po/eo.po (+533/-446)
po/es.po (+549/-448)
po/hu.po (+2471/-0)
po/id.po (+973/-1352)
po/it.po (+581/-438)
po/ka.po (+1831/-0)
po/kbd.pot (+448/-407)
po/nl.po (+554/-436)
po/pl.po (+470/-441)
po/pt.po (+517/-435)
po/pt_BR.po (+516/-435)
po/ro.po (+591/-486)
po/ru.po (+512/-433)
po/sq.po (+1861/-0)
po/sr.po (+542/-445)
po/sv.po (+507/-475)
po/tr.po (+555/-433)
po/uk.po (+541/-444)
po/vi.po (+550/-433)
po/zh_CN.po (+591/-494)
src/Makefile.am (+43/-45)
src/chvt.c (+21/-36)
src/clrunimap.c (+53/-7)
src/deallocvt.c (+24/-38)
src/dumpkeys.c (+8/-28)
src/fgconsole.c (+4/-26)
src/getkeycodes.c (+4/-24)
src/getunimap.c (+7/-26)
src/include/kbd/compiler_attributes.h (+72/-0)
src/include/kbd/kbdfile.h (+10/-10)
src/include/kbd/keymap/array.h (+10/-7)
src/include/kbd/keymap/charset.h (+7/-4)
src/include/kbd/keymap/common.h (+14/-5)
src/include/kbd/keymap/context.h (+19/-5)
src/include/kbd/keymap/dump.h (+34/-21)
src/include/kbd/keymap/kernel.h (+14/-12)
src/include/kbd/keymap/kmap.h (+76/-0)
src/include/kbd/keymap/logging.h (+13/-14)
src/include/kbd/kfont.h (+34/-37)
src/include/kbdfile.h (+7/-0)
src/include/keymap.h (+13/-0)
src/include/kfont.h (+7/-0)
src/kbd_mode.c (+4/-25)
src/kbdinfo.c (+4/-26)
src/kbdrate.c (+9/-31)
src/libcommon/Makefile.am (+2/-2)
src/libcommon/error.c (+2/-4)
src/libcommon/libcommon.h (+13/-43)
src/libcommon/nls.h (+53/-0)
src/libcommon/version.c (+28/-11)
src/libkbdfile/Makefile.am (+5/-12)
src/libkbdfile/contextP.h (+0/-1)
src/libkbdfile/init.c (+6/-15)
src/libkbdfile/kbdfile.c (+24/-14)
src/libkeymap/Makefile.am (+16/-34)
src/libkeymap/analyze.l (+2/-8)
src/libkeymap/array.c (+1/-1)
src/libkeymap/common.c (+38/-15)
src/libkeymap/contextP.h (+11/-0)
src/libkeymap/diacr.c (+0/-1)
src/libkeymap/dump.c (+13/-4)
src/libkeymap/func.c (+0/-1)
src/libkeymap/kernel.c (+0/-1)
src/libkeymap/kmap.c (+0/-1)
src/libkeymap/ksyms.c (+20/-6)
src/libkeymap/ksyms.h (+0/-8)
src/libkeymap/loadkeys.c (+0/-1)
src/libkeymap/modifiers.c (+3/-1)
src/libkeymap/parser.y (+3/-4)
src/libkeymap/summary.c (+0/-1)
src/libkfont/Makefile.am (+11/-26)
src/libkfont/context.c (+4/-3)
src/libkfont/kdfontop.c (+32/-3)
src/libkfont/kdmapop.c (+1/-2)
src/libkfont/kfontP.h (+22/-11)
src/libkfont/loadunimap.c (+1/-3)
src/libkfont/mapscrn.c (+0/-2)
src/libkfont/psffontop.c (+0/-1)
src/libkfont/psfxtable.c (+1/-2)
src/libkfont/setfont.c (+3/-2)
src/loadkeys.c (+8/-28)
src/loadunimap.c (+7/-27)
src/mapscrn.c (+8/-27)
src/openvt.c (+28/-52)
src/outpsfheader.c (+66/-29)
src/psfxtable.c (+10/-10)
src/readpsfheader.c (+43/-10)
src/resizecons.c (+5/-8)
src/screendump.c (+54/-10)
src/setfont.c (+271/-106)
src/setkeycodes.c (+10/-31)
src/setleds.c (+7/-40)
src/setlogcons.c (+58/-20)
src/setmetamode.c (+7/-29)
src/setpalette.c (+60/-16)
src/setvesablank.c (+1/-2)
src/setvtrgb.c (+5/-27)
src/showconsolefont.c (+13/-34)
src/showkey.c (+12/-34)
src/spawn_command.c (+11/-4)
src/totextmode.c (+2/-4)
src/vlock/Makefile.am (+3/-5)
src/vlock/auth.c (+3/-3)
src/vlock/pam.c (+3/-3)
src/vlock/parse.c (+9/-10)
src/vlock/screen.c (+1/-1)
src/vlock/username.c (+2/-2)
src/vlock/vlock.c (+0/-1)
src/vlock/vt.c (+22/-22)
tests/data/e2e/setfont-test01.calls (+1/-0)
tests/helpers/Makefile.am (+2/-4)
tests/helpers/libkeymap-bkeymap.c (+1/-3)
tests/helpers/libkeymap-dumpkeys.c (+1/-3)
tests/helpers/libkeymap-mktable.c (+1/-3)
tests/helpers/libkeymap-showmaps.c (+2/-4)
tests/libkbdfile/Makefile.am (+2/-3)
tests/libkbdfile/libkbdfile-test01.c (+1/-3)
tests/libkbdfile/libkbdfile-test02.c (+3/-5)
tests/libkbdfile/libkbdfile-test03.c (+3/-4)
tests/libkbdfile/libkbdfile-test04.c (+3/-5)
tests/libkbdfile/libkbdfile-test05.c (+3/-4)
tests/libkbdfile/libkbdfile-test06.c (+3/-5)
tests/libkbdfile/libkbdfile-test07.c (+3/-5)
tests/libkbdfile/libkbdfile-test08.c (+4/-5)
tests/libkbdfile/libkbdfile-test09.c (+3/-5)
tests/libkbdfile/libkbdfile-test10.c (+2/-4)
tests/libkbdfile/libkbdfile-test11.c (+3/-5)
tests/libkbdfile/libkbdfile-test12.c (+3/-5)
tests/libkbdfile/libkbdfile-test13.c (+3/-5)
tests/libkeymap/Makefile.am (+2/-4)
tests/libkeymap/libkeymap-test01.c (+3/-5)
tests/libkeymap/libkeymap-test02.c (+1/-3)
tests/libkeymap/libkeymap-test03.c (+1/-3)
tests/libkeymap/libkeymap-test04.c (+1/-3)
tests/libkeymap/libkeymap-test05.c (+3/-5)
tests/libkeymap/libkeymap-test06.c (+3/-5)
tests/libkeymap/libkeymap-test07.c (+4/-6)
tests/libkeymap/libkeymap-test08.c (+4/-6)
tests/libkeymap/libkeymap-test09.c (+4/-6)
tests/libkeymap/libkeymap-test10.c (+3/-5)
tests/libkeymap/libkeymap-test11.c (+3/-5)
tests/libkeymap/libkeymap-test12.c (+1/-3)
tests/libkeymap/libkeymap-test13.c (+1/-3)
tests/libkeymap/libkeymap-test14.c (+1/-3)
tests/libkeymap/libkeymap-test15.c (+1/-3)
tests/libkeymap/libkeymap-test16.c (+1/-4)
tests/libkeymap/libkeymap-test17.c (+1/-3)
tests/libkeymap/libkeymap-test18.c (+1/-3)
| Changed in kbd (Ubuntu): | |
| importance: | Undecided → Medium |
| assignee: | nobody → Skia (hyask) |
| status: | New → In Progress |
| Changed in kbd (Ubuntu): | |
| assignee: | Skia (hyask) → Graham Inggs (ginggs) |
| Changed in kbd (Ubuntu): | |
| milestone: | none → ubuntu-25.04-feature-freeze |
| Changed in kbd (Ubuntu): | |
| status: | In Progress → Fix Committed |
| Launchpad Janitor (janitor) wrote | #1 |
| Changed in kbd (Ubuntu): | |
| status: | Fix Committed → Fix Released |
This bug was fixed in the package kbd - 2.7.1-2ubuntu1
---------------
kbd (2.7.1-2ubuntu1) plucky; urgency=medium
* Merge with Debian unstable (LP: #2098852).
Remaining changes:
- Add setfont, kbd_mode, and loadkeys to initramfs for console-setup.
- Use ckbcomp to get the keyboard layout if other data files are not available.
- Change loadkeys to find any console not in raw mode when invoked
without an explicit console parameter, in case the foreground console
is in raw mode.
- debian/control: Depend on console-setup | console-setup-mini, since
console-
- Add setvtrgb to kbd-udeb. (LP #730672)
Dropped changes:
- d/p/Add-
kbd (2.7.1-2) unstable; urgency=medium
* Team upload.
* Add debian/
kbd (2.7.1-1) unstable; urgency=medium
* Team upload.
* New upstream release.
* Upload to unstable.
kbd (2.7~rc1-1) experimental; urgency=medium
* Team upload.
* debian/watch: Mangle rc versions to ~rc
* debian/gbp: Rename branches to /latest according to DEP14
* New upstream release candidate.
* Upload to experimental.
* Update Misc...patch to apply
* Revert "Cherry-pick patches from upstream fixing gcc14 FTBFS"
* debian/kbd.docs: Drop outdated docs removed upstream
* debian/copyright: Update renamed files
kbd (2.6.4-3) unstable; urgency=medium
* Team upload.
* Cherry-pick patches from upstream fixing gcc14 FTBFS (Closes: #1075109)
* Build-dep on pkgconf instead of pkg-config
-- Florent 'Skia' Jacquet <email address hidden> Wed, 19 Feb 2025 13:10:53 +0100