Re: Bug#1113961: trixie-pu: package console-setup/1.240+deb13u1
Control: tag -1 d-i
Hi,
Looks fine to me, but d-i ack needed for the udeb. Full diff enclosed.
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?
Thanks,
On Thu, Sep 04, 2025 at 07:39:44PM +0200, Samuel Thibault wrote:
> diff -Nru console-setup-1.240/CHANGES console-setup-1.240+deb13u1/CHANGES
> --- console-setup-1.240/CHANGES 2025-07-20 06:30:07.000000000 +0200
> +++ console-setup-1.240+deb13u1/CHANGES 2025-09-04 19:29:20.000000000 +0200
> @@ -1,3 +1,11 @@
> +console-setup (1.240+deb13u1) trixie; urgency=medium
> +
> + * keyboard-configuration.templates: Update dz(la) into dz(azerty-oss).
> + * keyboard-configuration.templates: Use ca/multix variant instead of
> + ca/multi (Closes: #1111994).
> +
> + -- Samuel Thibault <sthibault@debian.org> Thu, 04 Sep 2025 19:29:20 +0200
> +
> console-setup (1.240) unstable; urgency=medium
>
> [ Updated translations ]
> diff -Nru console-setup-1.240/debian/changelog console-setup-1.240+deb13u1/debian/changelog
> --- console-setup-1.240/debian/changelog 2025-07-20 06:30:07.000000000 +0200
> +++ console-setup-1.240+deb13u1/debian/changelog 2025-09-04 19:29:20.000000000 +0200
> @@ -1,3 +1,11 @@
> +console-setup (1.240+deb13u1) trixie; urgency=medium
> +
> + * keyboard-configuration.templates: Update dz(la) into dz(azerty-oss).
> + * keyboard-configuration.templates: Use ca/multix variant instead of
> + ca/multi (Closes: #1111994).
> +
> + -- Samuel Thibault <sthibault@debian.org> Thu, 04 Sep 2025 19:29:20 +0200
> +
> console-setup (1.240) unstable; urgency=medium
>
> [ Updated translations ]
> diff -Nru console-setup-1.240/debian/console-setup-udeb.templates console-setup-1.240+deb13u1/debian/console-setup-udeb.templates
> --- console-setup-1.240/debian/console-setup-udeb.templates 2024-02-09 13:54:59.000000000 +0100
> +++ console-setup-1.240+deb13u1/debian/console-setup-udeb.templates 2025-09-04 19:28:21.000000000 +0200
> @@ -165,7 +165,7 @@
>
> Template: keyboard-configuration/xkb-keymap
> Type: select
> -Choices-C: us, al, ara, es(ast), bd, by, in(ben), be, dz(la), ba, br, gb, bg, bg(phonetic), mm, ca, ca(multi), es(cat), cn, hr, cz, dk, nl, us(dvorak), bt, epo, ee, et, fi, fr(latin9), ge, de, gr, in(guj), in(jhelum), il, in, hu, is, ie, it, jp, in(kan), kz, kh, kg, kr(kr104), tr(ku_f), tr(ku), la, latam, lv, lt, mk, in(mal), np, no(smi), no, ir, ph, pl, pt, in(guru), ro, ru, rs, pk(snd), lk, sk, si, es, se, ch(fr), ch, tj, in(tam), in(tel), th, cn(tib), tr(f), tr, tw(indigenous), ua, cn(ug), vn
> +Choices-C: us, al, ara, es(ast), bd, by, in(ben), be, dz(azerty-deadkeys), ba, br, gb, bg, bg(phonetic), mm, ca, ca(multix), es(cat), cn, hr, cz, dk, nl, us(dvorak), bt, epo, ee, et, fi, fr(latin9), ge, de, gr, in(guj), in(jhelum), il, in, hu, is, ie, it, jp, in(kan), kz, kh, kg, kr(kr104), tr(ku_f), tr(ku), la, latam, lv, lt, mk, in(mal), np, no(smi), no, ir, ph, pl, pt, in(guru), ro, ru, rs, pk(snd), lk, sk, si, es, se, ch(fr), ch, tj, in(tam), in(tel), th, cn(tib), tr(f), tr, tw(indigenous), ua, cn(ug), vn
> # :sl1:
> #flag:partial
> __Choices: American English, Albanian, Arabic, Asturian, Bangladesh, Belarusian, Bengali, Belgian, Berber (Latin), Bosnian, Brazilian, British English, Bulgarian (BDS layout), Bulgarian (phonetic layout), Burmese, Canadian French, Canadian Multilingual, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Dvorak, Dzongkha, Esperanto, Estonian, Ethiopian, Finnish, French, Georgian, German, Greek, Gujarati, Gurmukhi, Hebrew, Hindi, Hungarian, Icelandic, Irish, Italian, Japanese, Kannada, Kazakh, Khmer, Kirghiz, Korean, Kurdish (F layout), Kurdish (Q layout), Lao, Latin American, Latvian, Lithuanian, Macedonian, Malayalam, Nepali, Northern Sami, Norwegian, Persian, Philippines, Polish, Portuguese, Punjabi, Romanian, Russian, Serbian (Cyrillic), Sindhi, Sinhala, Slovak, Slovenian, Spanish, Swedish, Swiss French, Swiss German, Tajik, Tamil, Telugu, Thai, Tibetan, Turkish (F layout), Turkish (Q layout), Taiwanese, Ukrainian, Uyghur, Vietnamese
> diff -Nru console-setup-1.240/debian/keyboard-configuration.templates console-setup-1.240+deb13u1/debian/keyboard-configuration.templates
> --- console-setup-1.240/debian/keyboard-configuration.templates 2024-02-09 13:54:59.000000000 +0100
> +++ console-setup-1.240+deb13u1/debian/keyboard-configuration.templates 2025-09-04 19:28:21.000000000 +0200
> @@ -165,7 +165,7 @@
>
> Template: keyboard-configuration/xkb-keymap
> Type: select
> -Choices-C: us, al, ara, es(ast), bd, by, in(ben), be, dz(la), ba, br, gb, bg, bg(phonetic), mm, ca, ca(multi), es(cat), cn, hr, cz, dk, nl, us(dvorak), bt, epo, ee, et, fi, fr(latin9), ge, de, gr, in(guj), in(jhelum), il, in, hu, is, ie, it, jp, in(kan), kz, kh, kg, kr(kr104), tr(ku_f), tr(ku), la, latam, lv, lt, mk, in(mal), np, no(smi), no, ir, ph, pl, pt, in(guru), ro, ru, rs, pk(snd), lk, sk, si, es, se, ch(fr), ch, tj, in(tam), in(tel), th, cn(tib), tr(f), tr, tw(indigenous), ua, cn(ug), vn
> +Choices-C: us, al, ara, es(ast), bd, by, in(ben), be, dz(azerty-deadkeys), ba, br, gb, bg, bg(phonetic), mm, ca, ca(multix), es(cat), cn, hr, cz, dk, nl, us(dvorak), bt, epo, ee, et, fi, fr(latin9), ge, de, gr, in(guj), in(jhelum), il, in, hu, is, ie, it, jp, in(kan), kz, kh, kg, kr(kr104), tr(ku_f), tr(ku), la, latam, lv, lt, mk, in(mal), np, no(smi), no, ir, ph, pl, pt, in(guru), ro, ru, rs, pk(snd), lk, sk, si, es, se, ch(fr), ch, tj, in(tam), in(tel), th, cn(tib), tr(f), tr, tw(indigenous), ua, cn(ug), vn
> # :sl1:
> #flag:partial
> __Choices: American English, Albanian, Arabic, Asturian, Bangladesh, Belarusian, Bengali, Belgian, Berber (Latin), Bosnian, Brazilian, British English, Bulgarian (BDS layout), Bulgarian (phonetic layout), Burmese, Canadian French, Canadian Multilingual, Catalan, Chinese, Croatian, Czech, Danish, Dutch, Dvorak, Dzongkha, Esperanto, Estonian, Ethiopian, Finnish, French, Georgian, German, Greek, Gujarati, Gurmukhi, Hebrew, Hindi, Hungarian, Icelandic, Irish, Italian, Japanese, Kannada, Kazakh, Khmer, Kirghiz, Korean, Kurdish (F layout), Kurdish (Q layout), Lao, Latin American, Latvian, Lithuanian, Macedonian, Malayalam, Nepali, Northern Sami, Norwegian, Persian, Philippines, Polish, Portuguese, Punjabi, Romanian, Russian, Serbian (Cyrillic), Sindhi, Sinhala, Slovak, Slovenian, Spanish, Swedish, Swiss French, Swiss German, Tajik, Tamil, Telugu, Thai, Tibetan, Turkish (F layout), Turkish (Q layout), Taiwanese, Ukrainian, Uyghur, Vietnamese
> diff -Nru console-setup-1.240/debian/po/templates.pot console-setup-1.240+deb13u1/debian/po/templates.pot
> --- console-setup-1.240/debian/po/templates.pot 2025-07-20 06:30:07.000000000 +0200
> +++ console-setup-1.240+deb13u1/debian/po/templates.pot 2025-09-04 19:29:20.000000000 +0200
> @@ -8,7 +8,7 @@
> msgstr ""
> "Project-Id-Version: console-setup\n"
> "Report-Msgid-Bugs-To: console-setup@packages.debian.org\n"
> -"POT-Creation-Date: 2025-07-20 06:45+0200\n"
> +"POT-Creation-Date: 2025-09-04 19:35+0200\n"
> "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
> "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
> "Language-Team: LANGUAGE <LL@li.org>\n"
--
Jonathan Wiltshire jmw@debian.org
Debian Developer http://people.debian.org/~jmw
4096R: 0xD3524C51 / 0A55 B7C5 1223 3942 86EC 74C3 5394 479D D352 4C51
ed25519/0x196418AAEB74C8A1: CA619D65A72A7BADFC96D280196418AAEB74C8A1
Reply to: