Merge branch 'master' into fixup-sp6

Fixing the IBS conflicts in https://build.suse.de/request/show/310734 This brings in the "ru" keymap fix from master (bsc#1194609)
yast · Oct 20, 2023 · 2732184 · 2732184
2 parents beee005 + fcbc7fd
commit 2732184
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/dropping_kbd_legacy.md b/dropping_kbd_legacy.md
@@ -67,7 +67,7 @@ once, so removing kbd-legacy would break these languages als in X11.
 | Legacy keyboard map  | Selected replacement | Other options | Note           |
 | -------------------- | -------------------- | ------------- | ---------      |
 | gr                   | ?                    |               | Greek          |
-| ruwin_alt-UTF-8      | ?                    |               | Russian        |
+| ru                   | ?                    |               | Russian        |
 | tj_alt-UTF8          | ?                    |               | Tajik          |
 | ua-utf               | ?                    |               | Ukrainian      |
 

diff --git a/keyboard/src/lib/y2keyboard/keyboards.rb b/keyboard/src/lib/y2keyboard/keyboards.rb
@@ -226,7 +226,7 @@ def self.always_present_keyboards
       },
       { "description" => _("Russian"),
         "alias" => "russian",
-        "code" => "ruwin_alt-UTF-8", # not_in_xkb
+        "code" => "ru", # not_in_xkb
         "suggested_for_lang" => ["ru", "ru_RU.KOI8-R"]
       },
       { "description" => _("Serbian"),

diff --git a/package/yast2-country.changes b/package/yast2-country.changes
@@ -18,6 +18,30 @@ Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
 
 - Branch package for SP6 (bsc#1208913)
 
+-------------------------------------------------------------------
+Thu Aug 10 10:00:35 UTC 2023 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Allow changing date to a later year than 2032 (bsc#1214144)
+- 4.6.3
+
+-------------------------------------------------------------------
+Thu Apr 20 14:10:19 UTC 2023 - Martin Vidner <mvidner@suse.com>
+
+- Cleanup: use "ru" keymap for Russian, not "ruwin_alt-UTF-8"
+  (bsc#1194609)
+- 4.6.2
+
+-------------------------------------------------------------------
+Tue Mar 28 20:10:19 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
+
+- Replace call to mkinitrd with dracut (bsc#1203019)
+- 4.6.1
+
+-------------------------------------------------------------------
+Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák <lslezak@suse.cz>
+
+- Bump version to 4.6.0 (bsc#1208913)
+
 -------------------------------------------------------------------
 Wed Jan 11 12:13:52 UTC 2023 - José Iván López González <jlopez@suse.com>