Hello community,
here is the log from the commit of package yast2-country
checked in at Thu Aug 9 23:13:27 CEST 2007.
--------
--- yast2-country/yast2-country.changes 2007-08-06 12:45:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2007-08-09 16:25:02.883510000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 9 15:20:35 CEST 2007 - jsuchome@suse.cz
+
+- during live installation config, do not automatically adapt
+ keyboard layout to the language (#298792)
+- 2.15.17
+
+-------------------------------------------------------------------
Old:
----
yast2-country-2.15.16.tar.bz2
New:
----
yast2-country-2.15.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-country.spec ++++++
--- /var/tmp/diff_new_pack.Q20191/_old 2007-08-09 23:12:12.000000000 +0200
+++ /var/tmp/diff_new_pack.Q20191/_new 2007-08-09 23:12:12.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-country (Version 2.15.16)
+# spec file for package yast2-country (Version 2.15.17)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-country
-Version: 2.15.16
+Version: 2.15.17
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-country-2.15.16.tar.bz2
+Source0: yast2-country-2.15.17.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite
Requires: yast2-trans-stats yast2-perl-bindings timezone
@@ -64,7 +64,7 @@
Jiri Suchomel
%prep
-%setup -n yast2-country-2.15.16
+%setup -n yast2-country-2.15.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -111,6 +111,10 @@
%{prefix}/share/applications/YaST2/timezone.desktop
%changelog
+* Thu Aug 09 2007 - jsuchome@suse.cz
+- during live installation config, do not automatically adapt
+ keyboard layout to the language (#298792)
+- 2.15.17
* Fri Aug 03 2007 - jsuchome@suse.cz
- disable DPMS while adapting time (#294292)
- keyboard layout map: remove architecture, rely on model (#257434)
++++++ yast2-country-2.15.16.tar.bz2 -> yast2-country-2.15.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/keyboard/data/keyboard_raw.ycp new/yast2-country-2.15.17/keyboard/data/keyboard_raw.ycp
--- old/yast2-country-2.15.16/keyboard/data/keyboard_raw.ycp 2007-08-01 12:57:34.000000000 +0200
+++ new/yast2-country-2.15.17/keyboard/data/keyboard_raw.ycp 2007-08-06 12:46:17.000000000 +0200
@@ -10,7 +10,7 @@
* Summary:
* The untranslated keyboard database.
*
- * $Id: keyboard_raw.ycp 33853 2006-10-30 15:07:21Z jsuchome $
+ * $Id: keyboard_raw.ycp 39978 2007-08-06 10:46:16Z jsuchome $
*
* *****************************************************************
* In case of changes please keep the following three files in sync:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/keyboard/src/modules/Keyboard.ycp new/yast2-country-2.15.17/keyboard/src/modules/Keyboard.ycp
--- old/yast2-country-2.15.16/keyboard/src/modules/Keyboard.ycp 2007-08-01 13:31:23.000000000 +0200
+++ new/yast2-country-2.15.17/keyboard/src/modules/Keyboard.ycp 2007-08-09 15:11:21.000000000 +0200
@@ -13,7 +13,7 @@
*
* Maintainer: Jiri Suchomel
*
- * $Id: Keyboard.ycp 32769 2006-09-08 09:29:15Z jsuchome $
+ * $Id: Keyboard.ycp 39978 2007-08-06 10:46:16Z jsuchome $
*
* Usage:
* ------
@@ -617,7 +617,7 @@
restore_called = true;
GetKbdSysconfig();
- if (!Stage::initial ())
+ if (!Stage::initial () || Mode::live_installation ())
{
// Read YaST2 keyboard var.
//
@@ -849,7 +849,7 @@
// If not in initial mode try to restore from sysconfig.
//
- if (!Stage::initial ())
+ if (!Stage::initial () || Mode::live_installation ())
{
success = Restore();
@@ -880,8 +880,7 @@
}
// In initial mode or if restoring failed do probe.
- //
- if( Stage::initial () || !success ) // initial mode or no restore success
+ if(!success || (Stage::initial () && !Mode::live_installation ()))
{
// On module entry probe the hardware and set all those data
// needed for public access.
@@ -1154,7 +1153,7 @@
// Actually do it only if we are in graphical mode.
//
boolean textmode = Linuxrc::text ();
- if (!Stage::initial ())
+ if (!Stage::initial () || Mode::live_installation ())
{
map display_info = UI::GetDisplayInfo ();
textmode = display_info["TextMode"]:false;
@@ -1200,7 +1199,7 @@
SetConsole (keyboard);
SetX11 (keyboard);
- if (Stage::initial ())
+ if (Stage::initial () && !Mode::live_installation ())
{
map yinf = $[];
AsciiFile::SetDelimiter( yinf, " " );
@@ -1252,7 +1251,7 @@
// set from outside the module.
if (user_decision ||
(Mode::update () && !Stage::initial ()) ||
- Mode::autoinst () ||
+ Mode::autoinst () || Mode::live_installation () ||
ProductFeatures::GetStringFeature ("globals", "keyboard") != "")
{
if (language_changed)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/keyboard/testsuite/tests/Keyboard.ycp new/yast2-country-2.15.17/keyboard/testsuite/tests/Keyboard.ycp
--- old/yast2-country-2.15.16/keyboard/testsuite/tests/Keyboard.ycp 2007-08-01 13:19:22.000000000 +0200
+++ new/yast2-country-2.15.17/keyboard/testsuite/tests/Keyboard.ycp 2007-08-06 12:46:17.000000000 +0200
@@ -1,7 +1,7 @@
/**
* tests for Keyboard.ycp constructor
* Author: jsuchome@suse.cz
- * $Id: Keyboard.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: Keyboard.ycp 39978 2007-08-06 10:46:16Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/keyboard/testsuite/tests/MakeProposal.ycp new/yast2-country-2.15.17/keyboard/testsuite/tests/MakeProposal.ycp
--- old/yast2-country-2.15.16/keyboard/testsuite/tests/MakeProposal.ycp 2007-08-01 13:19:37.000000000 +0200
+++ new/yast2-country-2.15.17/keyboard/testsuite/tests/MakeProposal.ycp 2007-08-06 12:46:17.000000000 +0200
@@ -1,7 +1,7 @@
/**
* tests for Keyboard::MakeProposal
* Author: jsuchome@suse.cz
- * $Id: MakeProposal.ycp 27936 2006-02-13 20:01:14Z olh $
+ * $Id: MakeProposal.ycp 39978 2007-08-06 10:46:16Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/keyboard/testsuite/tests/Probe.ycp new/yast2-country-2.15.17/keyboard/testsuite/tests/Probe.ycp
--- old/yast2-country-2.15.16/keyboard/testsuite/tests/Probe.ycp 2007-08-01 13:25:31.000000000 +0200
+++ new/yast2-country-2.15.17/keyboard/testsuite/tests/Probe.ycp 2007-08-06 12:46:17.000000000 +0200
@@ -3,7 +3,7 @@
* Simulate that "dk" keyboard was set in linuxrc: see bug #118571
*
* Author: Jiri Suchomel
- * $Id: Probe.ycp 32769 2006-09-08 09:29:15Z jsuchome $
+ * $Id: Probe.ycp 39978 2007-08-06 10:46:16Z jsuchome $
*/
{
// testedfiles: Keyboard.ycp
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/timezone/src/Timezone.ycp new/yast2-country-2.15.17/timezone/src/Timezone.ycp
--- old/yast2-country-2.15.16/timezone/src/Timezone.ycp 2007-08-01 13:31:45.000000000 +0200
+++ new/yast2-country-2.15.17/timezone/src/Timezone.ycp 2007-08-06 12:46:17.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Klaus Kaempf
* Thomas Roelz
*
- * $Id: Timezone.ycp 34195 2006-11-09 11:41:43Z jsuchome $
+ * $Id: Timezone.ycp 39978 2007-08-06 10:46:16Z jsuchome $
*/
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-country-2.15.16/VERSION new/yast2-country-2.15.17/VERSION
--- old/yast2-country-2.15.16/VERSION 2007-08-06 12:35:11.000000000 +0200
+++ new/yast2-country-2.15.17/VERSION 2007-08-09 15:25:00.000000000 +0200
@@ -1 +1 @@
-2.15.16
+2.15.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org