Hello community, here is the log from the commit of package yast2-firstboot for openSUSE:Factory checked in at Tue Oct 27 16:48:17 CET 2009. -------- --- yast2-firstboot/yast2-firstboot.changes 2009-08-20 16:38:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-firstboot/yast2-firstboot.changes 2009-10-27 13:47:01.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Oct 27 13:32:11 CET 2009 - jsuchome@suse.cz + +- package firstboot_language_keyboard.ycp file (fate#306296) +- 2.18.10 + +------------------------------------------------------------------- +Tue Oct 27 13:25:19 CET 2009 - jsuchome@suse.cz + +- fixed example firstboot.xml: correct client name +- 2.18.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-firstboot-2.18.8.tar.bz2 New: ---- yast2-firstboot-2.18.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-firstboot.spec ++++++ --- /var/tmp/diff_new_pack.mjkDGr/_old 2009-10-27 16:47:58.000000000 +0100 +++ /var/tmp/diff_new_pack.mjkDGr/_new 2009-10-27 16:47:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-firstboot (Version 2.18.8) +# spec file for package yast2-firstboot (Version 2.18.10) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-firstboot -Version: 2.18.8 +Version: 2.18.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-firstboot-2.18.8.tar.bz2 +Source0: yast2-firstboot-2.18.10.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -54,7 +54,7 @@ created to personalize the system. %prep -%setup -n yast2-firstboot-2.18.8 +%setup -n yast2-firstboot-2.18.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-firstboot-2.18.8.tar.bz2 -> yast2-firstboot-2.18.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/VERSION new/yast2-firstboot-2.18.10/VERSION --- old/yast2-firstboot-2.18.8/VERSION 2009-08-20 16:38:07.000000000 +0200 +++ new/yast2-firstboot-2.18.10/VERSION 2009-10-27 13:32:38.000000000 +0100 @@ -1 +1 @@ -2.18.8 +2.18.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/configure new/yast2-firstboot-2.18.10/configure --- old/yast2-firstboot-2.18.8/configure 2009-07-30 15:34:03.000000000 +0200 +++ new/yast2-firstboot-2.18.10/configure 2009-10-27 13:39:46.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.18.7. +# Generated by GNU Autoconf 2.63 for yast2-firstboot 2.18.10. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-firstboot' PACKAGE_TARNAME='yast2-firstboot' -PACKAGE_VERSION='2.18.7' -PACKAGE_STRING='yast2-firstboot 2.18.7' +PACKAGE_VERSION='2.18.10' +PACKAGE_STRING='yast2-firstboot 2.18.10' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1282,7 +1282,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-firstboot 2.18.7 to adapt to many kinds of systems. +\`configure' configures yast2-firstboot 2.18.10 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1353,7 +1353,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-firstboot 2.18.7:";; + short | recursive ) echo "Configuration of yast2-firstboot 2.18.10:";; esac cat <<\_ACEOF @@ -1433,7 +1433,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-firstboot configure 2.18.7 +yast2-firstboot configure 2.18.10 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1447,7 +1447,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-firstboot $as_me 2.18.7, which was +It was created by yast2-firstboot $as_me 2.18.10, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2294,7 +2294,7 @@ # Define the identity of the package. PACKAGE='yast2-firstboot' - VERSION='2.18.7' + VERSION='2.18.10' cat >>confdefs.h <<_ACEOF @@ -2518,7 +2518,7 @@ -VERSION="2.18.7" +VERSION="2.18.10" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" @@ -3578,7 +3578,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-firstboot $as_me 2.18.7, which was +This file was extended by yast2-firstboot $as_me 2.18.10, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3628,7 +3628,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-firstboot config.status 2.18.7 +yast2-firstboot config.status 2.18.10 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/configure.in new/yast2-firstboot-2.18.10/configure.in --- old/yast2-firstboot-2.18.8/configure.in 2009-07-30 15:33:59.000000000 +0200 +++ new/yast2-firstboot-2.18.10/configure.in 2009-10-27 13:39:42.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-firstboot, 2.18.7, http://bugs.opensuse.org/, yast2-firstboot) +AC_INIT(yast2-firstboot, 2.18.10, http://bugs.opensuse.org/, yast2-firstboot) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.7" +VERSION="2.18.10" RPMNAME="yast2-firstboot" MAINTAINER="Jiri Suchomel <jsuchome@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/Makefile.am new/yast2-firstboot-2.18.10/src/Makefile.am --- old/yast2-firstboot-2.18.8/src/Makefile.am 2009-08-20 16:36:34.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/Makefile.am 2009-10-27 13:30:39.000000000 +0100 @@ -8,6 +8,7 @@ firstboot_write.ycp \ firstboot_desktop.ycp \ firstboot_language.ycp \ + firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ firstboot_welcome.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/Makefile.in new/yast2-firstboot-2.18.10/src/Makefile.in --- old/yast2-firstboot-2.18.8/src/Makefile.in 2009-08-20 16:38:11.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/Makefile.in 2009-10-27 13:39:46.000000000 +0100 @@ -202,6 +202,7 @@ firstboot_write.ycp \ firstboot_desktop.ycp \ firstboot_language.ycp \ + firstboot_language_keyboard.ycp \ firstboot_timezone.ycp \ firstboot_license.ycp \ firstboot_welcome.ycp \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/control/firstboot.xml new/yast2-firstboot-2.18.10/src/control/firstboot.xml --- old/yast2-firstboot-2.18.8/src/control/firstboot.xml 2009-07-16 15:59:29.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/control/firstboot.xml 2009-10-27 13:26:56.000000000 +0100 @@ -3,7 +3,7 @@ xmlns:config="http://www.suse.com/1.0/configns"> <!-- - $Id: firstboot.xml 58091 2009-07-16 13:59:29Z jsuchome $ + $Id: firstboot.xml 59221 2009-10-27 12:26:55Z jsuchome $ Work around for the text domain textdomain="firstboot" --> @@ -87,7 +87,7 @@ <label>Language and Keyboard</label> <enabled config:type="boolean">true</enabled> <!-- step for configuration of both language and keyboard layout (fate#306296) --> - <name>firstboot_language</name> + <name>firstboot_language_keyboard</name> </module> <module> <label>Language</label> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/firstboot_language.ycp new/yast2-firstboot-2.18.10/src/firstboot_language.ycp --- old/yast2-firstboot-2.18.8/src/firstboot_language.ycp 2009-08-20 16:35:12.000000000 +0200 +++ new/yast2-firstboot-2.18.10/src/firstboot_language.ycp 2009-08-20 16:38:39.000000000 +0200 @@ -12,7 +12,7 @@ * Modify: * * - * $Id: firstboot_language.ycp 58220 2009-07-30 13:46:08Z jsuchome $ + * $Id: firstboot_language.ycp 58401 2009-08-20 14:38:29Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-firstboot-2.18.8/src/firstboot_language_keyboard.ycp new/yast2-firstboot-2.18.10/src/firstboot_language_keyboard.ycp --- old/yast2-firstboot-2.18.8/src/firstboot_language_keyboard.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-firstboot-2.18.10/src/firstboot_language_keyboard.ycp 2009-07-30 15:46:14.000000000 +0200 @@ -0,0 +1,251 @@ +/** + * File: + * firstboot_language_keyboard.ycp + * + * Module: + * Firsboot + * + * Authors: + * Jiri Suchomel <jsuchome@suse.cz> + * Lukas Ocilka <locilka@suse.cz> + * + * Summary: + * This client shows dialog for choosing the language and keyboard layout + * + * $Id: firstboot_language_keyboard.ycp 58220 2009-07-30 13:46:08Z jsuchome $ + * + */ +{ + textdomain "firstboot"; + + import "Console"; + import "Directory"; + import "GetInstArgs"; + import "Keyboard"; + import "Label"; + import "Language"; + import "Popup"; + import "Report"; + import "Timezone"; + import "Wizard"; + import "Icon"; + + // ------------------------------------- main part of the client ----------- + + map argmap = GetInstArgs::argmap(); + + string language = Language::language; + + // language preselected in /etc/install.inf + string preselected = Language::preselected; + + boolean text_mode = Language::GetTextMode (); + + /* ---------------------------------------------------------------------- + * Build dialog + * ----------------------------------------------------------------------*/ + // heading text + string heading_text = _("Language and Keyboard Layout"); + + term languagesel = `ComboBox ( + `id (`language), + `opt (`notify, `hstretch), + // combo box label + _("&Language"), Language::GetLanguageItems (`first_screen) + ); + + term keyboardsel = `ComboBox ( + `id (`keyboard), + `opt (`notify, `hstretch), + // combo box label + _("&Keyboard Layout"), + Keyboard::GetKeyboardItems () + ); + + // this type of contents will be shown only for initial installation dialog + term contents = `VBox ( + `VWeight (3, `VStretch()), + `HSquash (`VBox ( + `HBox ( + `HSquash (Icon::Simple ("yast-language")), + `HSpacing (2), + `Left (languagesel) + ), + `VSpacing (1), + `HBox ( + `HSquash (Icon::Simple ("yast-keyboard")), + `HSpacing (2), + `Left (keyboardsel) + ) + )), + `VWeight (1, `VStretch()), + `VWeight (3, `VStretch()) + ); + + // help text for firstboot language + keyboard screen + string help_text = _("<p> +Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during +configuration and for the installed system. +</p> +") + + // help text, continued + _("<p> +Click <b>Next</b> to proceed to the next dialog. +</p> +") + + // help text, continued + _("<p> +Select <b>Abort</b> to abort the +installation process at any time. +</p> +"); + + // Screen title for the first interactive dialog + + Wizard::SetContents (heading_text, contents, help_text, + argmap["enable_back"]:true , argmap["enable_next"]:true); + Wizard::EnableAbortButton (); + + UI::ChangeWidget (`id (`language), `Value, language); + + if (Keyboard::user_decision == true) { + UI::ChangeWidget (`id (`keyboard), `Value, Keyboard::current_kbd); + } else { + string kbd = Keyboard::GetKeyboardForLanguage (language, "english-us"); + UI::ChangeWidget (`id (`keyboard), `Value, kbd); + } + + Wizard::SetTitleIcon ("yast-language"); + + // Get the user input. + // + any ret = nil; + + UI::SetFocus(`id(`language)); + + string keyboard = ""; + + // Returns true if the dialog needs redrawing + boolean SetLanguageIfChanged (any ret) { + + if (language != Language::language) + { + y2milestone ("Language changed from %1 to %2", Language::language, language); + Timezone::ResetZonemap (); + + // Set it in the Language module. + Language::Set (language); + } + // Check and set CJK languages + if (ret == `language && Language::CJKLanguage (language) && + !Language::CJKLanguage (preselected) && Language::GetTextMode ()) + { + // popup message (user selected CJK language in text mode) + Popup::Message (_("The selected language cannot be used in text mode. English is used for +installation, but the selected language will be used for the new system.")); + Language::WfmSetGivenLanguage ("en_US"); + } + else if (ret == `language) + { + Console::SelectFont (language); + // no yast translation for nn_NO, use nb_NO as a backup + if (language == "nn_NO") + { + y2milestone ("Nynorsk not translated, using Bokmål"); + Language::WfmSetGivenLanguage ("nb_NO"); + } + else + Language::WfmSetLanguage (); + } + + if (ret == `language) { + // Display newly translated dialog. + Wizard::SetFocusToNextButton(); + return true; + } + + if (ret == `next) { + Keyboard::Set (keyboard); + + // Language has been set already. + // On first run store users decision as default. + y2milestone("Resetting to default language"); + Language::SetDefault(); + + // only one is installed in firstboot + Language::languages = language; + + Timezone::SetTimezoneForLanguage (language); + + // Bugzilla #354133 + y2milestone ("Adjusting package and text locale to %1", language); + Pkg::SetPackageLocale (language); + Pkg::SetTextLocale (language); + + y2milestone ("Language: '%1', system encoding '%2'", language, WFM::GetEncoding()); + + // install language dependent packages now + // Language::PackagesModified () does not work here as _on_entry variables are not set + if (language != Language::ReadSysconfigLanguage ()) + { + if (!Language::PackagesInit ([language])) + { + // error message + Report::Error (_("There is not enough space to install all additional packages.")); + } + else + { + Language::PackagesCommit (); + } + } + + Language::Save (); + Keyboard::Save (); + Timezone::Save (); + Console::Save (); + } + + return false; + } + + while (true) { + ret = UI::UserInput(); + y2milestone ("UserInput() returned %1", ret); + + if (ret == `back) { + break; + + } else if (ret == `abort && Popup::ConfirmAbort (`painless)) { + Wizard::RestoreNextButton(); + ret = `abort; + break; + + } else if (ret == `keyboard) { + Keyboard::user_decision = true; + + } + else if (ret == `next || ret == `language) + { + language = (string) UI::QueryWidget (`id (`language), `Value); + keyboard = (string) UI::QueryWidget (`id (`keyboard), `Value); + + if (ret == `next && !Language::CheckIncompleteTranslation (language)) + { + continue; + } + + if (SetLanguageIfChanged (ret)) + { + ret = `again; + break; + } + + // kbd must be restarted after YaST finishes (#303808) + SCR::Execute (.target.bash, sformat ("touch %1/firstboot_kbd_restart", Directory::vardir)); + + if (ret == `next) break; + } + } + + return (symbol) ret; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org