Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at Tue Jan 12 09:26:03 CET 2010. -------- --- yast2-country/yast2-country.changes 2010-01-08 10:14:45.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2010-01-11 15:54:52.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Jan 11 15:27:15 CET 2010 - jsuchome@suse.cz + +- do not call setxkbmap if running over ssh (bnc#539218) +- 2.19.7 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.19.6.tar.bz2 New: ---- yast2-country-2.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.nWv4JU/_old 2010-01-12 09:25:32.000000000 +0100 +++ /var/tmp/diff_new_pack.nWv4JU/_new 2010-01-12 09:25:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-country (Version 2.19.6) +# spec file for package yast2-country (Version 2.19.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-country -Version: 2.19.6 +Version: 2.19.7 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.19.6.tar.bz2 +Source0: yast2-country-2.19.7.tar.bz2 Prefix: /usr Group: System/YaST License: GPLv2+ @@ -73,7 +73,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.19.6 +%setup -n yast2-country-2.19.7 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-country-2.19.6.tar.bz2 -> yast2-country-2.19.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.6/VERSION new/yast2-country-2.19.7/VERSION --- old/yast2-country-2.19.6/VERSION 2010-01-08 10:10:06.000000000 +0100 +++ new/yast2-country-2.19.7/VERSION 2010-01-11 15:28:03.000000000 +0100 @@ -1 +1 @@ -2.19.6 +2.19.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.19.6/keyboard/src/modules/Keyboard.ycp new/yast2-country-2.19.7/keyboard/src/modules/Keyboard.ycp --- old/yast2-country-2.19.6/keyboard/src/modules/Keyboard.ycp 2009-10-01 13:38:53.000000000 +0200 +++ new/yast2-country-2.19.7/keyboard/src/modules/Keyboard.ycp 2010-01-11 15:26:52.000000000 +0100 @@ -1072,10 +1072,16 @@ map display_info = UI::GetDisplayInfo (); textmode = display_info["TextMode"]:false; } + string display = getenv ("DISPLAY"); if (textmode) { y2milestone("Not setting X keyboard due to text mode"); } + // check if we are running over ssh: bnc#539218,c4 + else if (tointeger (splitstring (display, ":")[1]:"0") >= 10) + { + y2milestone("Not setting X keyboard: running over ssh"); + } else if (size (xkb_cmd)>0) { SetKeyboard (keyboard); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org