Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2015-08-21 12:42:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-country" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2015-08-10 09:14:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2015-08-21 12:42:05.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 18 14:18:52 UTC 2015 - sndirsch@suse.com + +- Use xkb converted console keymaps (better systemd support) where + applicable (fate#318426) +- 3.1.23 + +------------------------------------------------------------------- Old: ---- yast2-country-3.1.22.tar.bz2 New: ---- yast2-country-3.1.23.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.RgXtbG/_old 2015-08-21 12:42:06.000000000 +0200 +++ /var/tmp/diff_new_pack.RgXtbG/_new 2015-08-21 12:42:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-country-3.1.22.tar.bz2 -> yast2-country-3.1.23.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.22/keyboard/src/data/keyboard_raw.ycp new/yast2-country-3.1.23/keyboard/src/data/keyboard_raw.ycp --- old/yast2-country-3.1.22/keyboard/src/data/keyboard_raw.ycp 2015-07-31 14:54:42.000000000 +0200 +++ new/yast2-country-3.1.23/keyboard/src/data/keyboard_raw.ycp 2015-08-18 16:49:08.000000000 +0200 @@ -46,7 +46,7 @@ // keyboard layout _("English (UK)"), $[ - "pc104" : $[ "ncurses": "uk.map.gz"], + "pc104" : $[ "ncurses": "gb.map.gz"], "macintosh" : $[ "ncurses": "mac-uk.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunt5-uk.map.gz"], @@ -58,7 +58,7 @@ // keyboard layout _("German"), $[ - "pc104" : $[ "ncurses": "de-latin1-nodeadkeys.map.gz"], + "pc104" : $[ "ncurses": "de-nodeadkeys"], "macintosh" : $[ "ncurses": "mac-de-latin1-nodeadkeys.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunt5-de-latin1.map.gz" ], @@ -70,7 +70,7 @@ // keyboard layout _("German (with deadkeys)"), $[ - "pc104" : $[ "ncurses": "de-latin1.map.gz" ], + "pc104" : $[ "ncurses": "de.map.gz" ], "macintosh" : $[ "ncurses": "mac-de-latin1.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunt5-de-latin1.map.gz" ], @@ -82,7 +82,7 @@ // keyboard layout _("German (Switzerland)"), $[ - "pc104" : $[ "ncurses": "sg-latin1.map.gz" ], + "pc104" : $[ "ncurses": "ch-de_nodeadkeys.map.gz" ], "macintosh" : $[ "ncurses": "mac-de_CH.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunt5-de-latin1.map.gz" ], @@ -94,7 +94,7 @@ // keyboard layout _("French"), $[ - "pc104" : $[ "ncurses": "fr-latin1.map.gz"], + "pc104" : $[ "ncurses": "fr.map.gz"], "macintosh" : $[ "ncurses": "mac-fr-latin1.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunt5-fr-latin1.map.gz" ], @@ -106,7 +106,7 @@ // keyboard layout _("French (Switzerland)"), $[ - "pc104" : $[ "ncurses": "fr_CH-latin1.map.gz"], + "pc104" : $[ "ncurses": "ch-fr.map.gz"], "macintosh" : $[ "ncurses": "mac-fr_CH-latin1.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunt5-fr-latin1.map.gz" ], @@ -118,7 +118,7 @@ // keyboard layout _("French (Canada)"), $[ - "pc104" : $[ "ncurses": "cf.map.gz"], + "pc104" : $[ "ncurses": "ca-fr-legacy.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunt5-fr-latin1.map.gz" ], @@ -131,12 +131,11 @@ // keyboard layout _("Canadian (Multilingual)"), $[ - "pc104" : $[ "ncurses": "cn-latin1.map.gz"], + "pc104" : $[ "ncurses": "ca-multix.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], "type5_euro": $[ "ncurses": "sunkeymap.map.gz" ], - "pc104" : $[ "ncurses": "cn-latin1.map.gz" ], ] ], @@ -157,7 +156,7 @@ // keyboard layout _("Spanish (Latin America)"), $[ - "pc104" : $[ "ncurses": "la-latin1.map.gz"], + "pc104" : $[ "ncurses": "latam.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunt4-es.map.gz"], "type5" : $[ "ncurses": "sunt5-es.map.gz" ], @@ -169,7 +168,7 @@ // keyboard layout _("Spanish (CP 850)"), $[ - "pc104" : $[ "ncurses": "es-cp850.map.gz"], + "pc104" : $[ "ncurses": "es.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunt4-es.map.gz"], "type5" : $[ "ncurses": "sunt5-es.map.gz" ], @@ -193,7 +192,7 @@ // keyboard layout _("Portuguese"), $[ - "pc104" : $[ "ncurses": "pt-latin1.map.gz"], + "pc104" : $[ "ncurses": "pt.map.gz"], "macintosh" : $[ "ncurses": "mac-pt-latin1.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -205,7 +204,7 @@ // keyboard layout _("Portuguese (Brazil)"), $[ - "pc104" : $[ "ncurses": "br-abnt2.map.gz"], + "pc104" : $[ "ncurses": "br.map.gz"], "macintosh" : $[ "ncurses": "mac-br-abnt2.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -217,7 +216,7 @@ // keyboard layout _("Portuguese (Brazil -- US accents)"), $[ - "pc104" : $[ "ncurses": "us-acentos.map.gz"], + "pc104" : $[ "ncurses": "us-intl.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "sparc64" : $[ "type4": $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -253,7 +252,7 @@ // keyboard layout _("Danish"), $[ - "pc104" : $[ "ncurses": "dk-latin1.map.gz"], + "pc104" : $[ "ncurses": "dk.map.gz"], "macintosh" : $[ "ncurses": "mac-dk-latin1.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -265,7 +264,7 @@ // keyboard layout _("Norwegian"), $[ - "pc104" : $[ "ncurses": "no-latin1.map.gz"], + "pc104" : $[ "ncurses": "no.map.gz"], "macintosh" : $[ "ncurses": "mac-no-latin1.map.gz" ], "type4" : $[ "ncurses": "sunt4-no-latin1.map.gz"], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -277,7 +276,7 @@ // keyboard layout _("Swedish"), $[ - "pc104" : $[ "ncurses": "sv-latin1.map.gz"], + "pc104" : $[ "ncurses": "se.map.gz"], "macintosh" : $[ "ncurses": "mac-se.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunt5-se-latin1.map.gz" ], @@ -289,7 +288,7 @@ // keyboard layout _("Finnish"), $[ - "pc104" : $[ "ncurses": "fi.map.gz"], + "pc104" : $[ "ncurses": "fi-kotoistus.map.gz"], "macintosh" : $[ "ncurses": "mac-fi-latin1.map.gz"], "type4" : $[ "ncurses": "sunt4-fi-latin1.map.gz"], "type5" : $[ "ncurses": "sunt5-fi-latin1.map.gz" ], @@ -362,8 +361,7 @@ _("Slovene"), $[ "pc104" : $[ - "ncurses": "slovene.map.gz", - "compose" : "latin2" + "ncurses": "si.map.gz" ], "macintosh" : $[ "ncurses": "mac-us.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -377,8 +375,7 @@ _("Hungarian"), $[ "pc104" : $[ - "ncurses": "hu.map.gz", - "compose" : "latin2" + "ncurses": "hu.map.gz" ], "macintosh" : $[ "ncurses": "mac-hu.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], @@ -392,8 +389,7 @@ _("Polish"), $[ "pc104" : $[ - "ncurses": "Pl02.map.gz", - "compose" : "latin2" + "ncurses": "pl.map.gz" ], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sun-pl.map.gz"], @@ -432,7 +428,7 @@ // keyboard layout _("Estonian"), $[ - "pc104" : $[ "ncurses": "et.map.gz"], + "pc104" : $[ "ncurses": "ee.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunt5-ru.map.gz" ], @@ -444,7 +440,7 @@ // keyboard layout _("Lithuanian"), $[ - "pc104" : $[ "ncurses": "lt.baltic.map.gz"], + "pc104" : $[ "ncurses": "lt.map.gz"], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunkeymap.map.gz"], @@ -456,7 +452,7 @@ // keyboard layout _("Turkish"), $[ - "pc104" : $[ "ncurses": "trq.map.gz" ], + "pc104" : $[ "ncurses": "tr.map.gz" ], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -468,8 +464,7 @@ _("Croatian"), $[ "pc104" : $[ - "ncurses" : "croat.map.gz", - "compose" : "latin2" + "ncurses" : "hr.map.gz" ], "macintosh" : $[ "ncurses" : "mac-us.map.gz" @@ -490,7 +485,7 @@ // keyboard layout _("Japanese"), $[ - "pc104" : $[ "ncurses": "jp106.map.gz"], + "pc104" : $[ "ncurses": "jp.map.gz"], "macintosh" : $[ "ncurses": "mac-jp106.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz"], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -502,7 +497,7 @@ // keyboard layout _("Belgian"), $[ - "pc104" : $[ "ncurses": "be-latin1.map.gz"], + "pc104" : $[ "ncurses": "be.map.gz"], "macintosh" : $[ "ncurses": "mac-be.map.gz" ], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunt5-be-latin1.map.gz" ], @@ -526,7 +521,7 @@ // keyboard layout _("Icelandic"), $[ - "pc104" : $[ "ncurses": "is-latin1.map.gz" ], + "pc104" : $[ "ncurses": "is.map.gz" ], "macintosh" : $[ "ncurses": "mac-us.map.gz"], "type4" : $[ "ncurses": "sunkeymap.map.gz" ], "type5" : $[ "ncurses": "sunkeymap.map.gz" ], @@ -583,7 +578,7 @@ _("Korean"), $[ "pc104" : $[ - "ncurses" : "korean.map.gz", + "ncurses" : "kr.map.gz", ], "macintosh" : $[ "ncurses" : "mac-us.map.gz" @@ -640,7 +635,7 @@ _("Traditional Chinese"), $[ "pc104" : $[ - "ncurses" : "taiwanese.map.gz", + "ncurses" : "us.map.gz", ], "macintosh" : $[ "ncurses" : "mac-us.map.gz" @@ -662,7 +657,7 @@ _("Simplified Chinese"), $[ "pc104" : $[ - "ncurses" : "chinese.map.gz", + "ncurses" : "us.map.gz", ], "macintosh" : $[ "ncurses" : "mac-us.map.gz" @@ -705,7 +700,7 @@ _("US International"), $[ "pc104" : $[ - "ncurses" : "us-acentos.map.gz" + "ncurses" : "us-intl.map.gz" ], "macintosh" : $[ "ncurses" : "mac-us.map.gz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.22/keyboard/test/keyboard_test.rb new/yast2-country-3.1.23/keyboard/test/keyboard_test.rb --- old/yast2-country-3.1.22/keyboard/test/keyboard_test.rb 2015-07-31 14:54:42.000000000 +0200 +++ new/yast2-country-3.1.23/keyboard/test/keyboard_test.rb 2015-08-18 16:49:08.000000000 +0200 @@ -132,9 +132,9 @@ stub_presence_of "/usr/sbin/xkbctrl" allow(XVersion).to receive(:binPath).and_return "/usr/bin" - expect(SCR).to execute_bash(/loadkeys trq\.map\.gz/) + expect(SCR).to execute_bash(/loadkeys tr\.map\.gz/) # Called twice, for SetConsole and SetX11 - expect(SCR).to execute_bash(/xkbctrl trq\.map\.gz/).twice do |p, cmd| + expect(SCR).to execute_bash(/xkbctrl tr\.map\.gz/).twice do |p, cmd| dump_xkbctrl(:turkish, cmd.split("> ")[1]) end expect(SCR).to execute_bash(/setxkbmap .*layout tr/) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.22/package/yast2-country.changes new/yast2-country-3.1.23/package/yast2-country.changes --- old/yast2-country-3.1.22/package/yast2-country.changes 2015-07-31 14:54:42.000000000 +0200 +++ new/yast2-country-3.1.23/package/yast2-country.changes 2015-08-18 16:49:08.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Aug 18 14:18:52 UTC 2015 - sndirsch@suse.com + +- Use xkb converted console keymaps (better systemd support) where + applicable (fate#318426) +- 3.1.23 + +------------------------------------------------------------------- Fri Jul 24 14:30:50 UTC 2015 - mvidner@suse.com - Removed dependencies to packages dropped in 2002. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-3.1.22/package/yast2-country.spec new/yast2-country-3.1.23/package/yast2-country.spec --- old/yast2-country-3.1.22/package/yast2-country.spec 2015-07-31 14:54:42.000000000 +0200 +++ new/yast2-country-3.1.23/package/yast2-country.spec 2015-08-18 16:49:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-country -Version: 3.1.22 +Version: 3.1.23 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build