Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at 2012-01-19 09:45:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-country (Old) and /work/SRC/openSUSE:Factory/.yast2-country.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-country", Maintainer is "jsuch...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-country/yast2-country.changes 2012-01-04 08:01:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-country.new/yast2-country.changes 2012-01-19 09:45:02.000000000 +0100 @@ -1,0 +2,15 @@ +Fri Jan 13 11:35:23 CET 2012 - jsuch...@suse.cz + +- call GfxMenu::Update from client, so we do not have to require + yast2-bootloader package dependency (bnc#730391) +- expanded texts about UTC/localtime to convice user for using UTC + (bnc#732769) +- 2.22.4 + +------------------------------------------------------------------- +Thu Jan 12 09:35:32 CET 2012 - jsuch...@suse.cz + +- Confirmed license +- 2.22.3 + +------------------------------------------------------------------- Old: ---- yast2-country-2.22.2.tar.bz2 New: ---- yast2-country-2.22.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.qGMlhp/_old 2012-01-19 09:45:03.000000000 +0100 +++ /var/tmp/diff_new_pack.qGMlhp/_new 2012-01-19 09:45:03.000000000 +0100 @@ -19,14 +19,14 @@ Name: yast2-country -Version: 2.22.2 +Version: 2.22.4 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-country-%{version}.tar.bz2 Group: System/YaST -License: GPL-2.0+ +License: GPL-2.0 #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy @@ -116,6 +116,7 @@ %files %defattr(-,root,root) %doc %{_prefix}/share/doc/packages/yast2-country +%doc COPYING /usr/share/YaST2/modules/Console.y* /usr/share/YaST2/modules/Keyboard.y* /usr/share/YaST2/modules/Timezone.y* ++++++ yast2-country-2.22.2.tar.bz2 -> yast2-country-2.22.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/VERSION new/yast2-country-2.22.4/VERSION --- old/yast2-country-2.22.2/VERSION 2012-01-02 12:01:54.000000000 +0100 +++ new/yast2-country-2.22.4/VERSION 2012-01-12 15:22:56.000000000 +0100 @@ -1 +1 @@ -2.22.2 +2.22.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/configure new/yast2-country-2.22.4/configure --- old/yast2-country-2.22.2/configure 2011-11-14 14:00:28.000000000 +0100 +++ new/yast2-country-2.22.4/configure 2012-01-12 09:35:57.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-country 2.21.6. +# Generated by GNU Autoconf 2.68 for yast2-country 2.22.3. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2-country' PACKAGE_TARNAME='yast2-country' -PACKAGE_VERSION='2.21.6' -PACKAGE_STRING='yast2-country 2.21.6' +PACKAGE_VERSION='2.22.3' +PACKAGE_STRING='yast2-country 2.22.3' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1229,7 +1229,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-country 2.21.6 to adapt to many kinds of systems. +\`configure' configures yast2-country 2.22.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1300,7 +1300,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-country 2.21.6:";; + short | recursive ) echo "Configuration of yast2-country 2.22.3:";; esac cat <<\_ACEOF @@ -1380,7 +1380,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-country configure 2.21.6 +yast2-country configure 2.22.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1397,7 +1397,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-country $as_me 2.21.6, which was +It was created by yast2-country $as_me 2.22.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2327,7 +2327,7 @@ # Define the identity of the package. PACKAGE='yast2-country' - VERSION='2.21.6' + VERSION='2.22.3' cat >>confdefs.h <<_ACEOF @@ -2449,7 +2449,7 @@ -VERSION="2.21.6" +VERSION="2.22.3" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>" @@ -3379,7 +3379,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-country $as_me 2.21.6, which was +This file was extended by yast2-country $as_me 2.22.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3432,7 +3432,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-country config.status 2.21.6 +yast2-country config.status 2.22.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/configure.in new/yast2-country-2.22.4/configure.in --- old/yast2-country-2.22.2/configure.in 2011-11-14 14:00:25.000000000 +0100 +++ new/yast2-country-2.22.4/configure.in 2012-01-12 09:35:53.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-country, 2.21.6, http://bugs.opensuse.org/, yast2-country) +AC_INIT(yast2-country, 2.22.3, http://bugs.opensuse.org/, yast2-country) 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.21.6" +VERSION="2.22.3" RPMNAME="yast2-country" MAINTAINER="Jiri Suchomel <jsuch...@suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/console/src/Console.ycp new/yast2-country-2.22.4/console/src/Console.ycp --- old/yast2-country-2.22.2/console/src/Console.ycp 2010-06-25 10:56:49.000000000 +0200 +++ new/yast2-country-2.22.4/console/src/Console.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * Console.ycp @@ -20,7 +40,7 @@ *<LI> CONSOLE_ENCODING string console encoding</LI> *</UL> * - * $Id: Console.ycp 62155 2010-06-25 08:56:48Z jsuchome $ + * $Id: Console.ycp 67149 2012-01-12 08:37:15Z jsuchome $ * * Author: * Klaus Kaempf <kkae...@suse.de> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/keyboard/src/dialogs.ycp new/yast2-country-2.22.4/keyboard/src/dialogs.ycp --- old/yast2-country-2.22.2/keyboard/src/dialogs.ycp 2011-11-21 16:03:56.000000000 +0100 +++ new/yast2-country-2.22.4/keyboard/src/dialogs.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * keyboard/dialogs.ycp @@ -10,7 +30,7 @@ * Summary: * Dialogs for keyboard configuration * - * $Id: dialogs.ycp 66888 2011-11-21 15:03:56Z jsuchome $ + * $Id: dialogs.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { textdomain "country"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/keyboard/src/keyboard.ycp new/yast2-country-2.22.4/keyboard/src/keyboard.ycp --- old/yast2-country-2.22.2/keyboard/src/keyboard.ycp 2010-08-18 14:15:49.000000000 +0200 +++ new/yast2-country-2.22.4/keyboard/src/keyboard.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /* * * Module: keyboard.ycp @@ -12,7 +32,7 @@ * Modify: * * - * $Id: keyboard.ycp 58876 2009-10-01 11:38:52Z jsuchome $ + * $Id: keyboard.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/keyboard/src/keyboard_auto.ycp new/yast2-country-2.22.4/keyboard/src/keyboard_auto.ycp --- old/yast2-country-2.22.2/keyboard/src/keyboard_auto.ycp 2009-07-30 15:44:08.000000000 +0200 +++ new/yast2-country-2.22.4/keyboard/src/keyboard_auto.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,8 +1,28 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Autoinstallation client for keyboard setting * Author : Jiri Suchomel <jsuch...@suse.cz> * - * $Id: keyboard_auto.ycp 58219 2009-07-30 13:44:02Z jsuchome $ + * $Id: keyboard_auto.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { import "Arch"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/keyboard/src/modules/Keyboard.ycp new/yast2-country-2.22.4/keyboard/src/modules/Keyboard.ycp --- old/yast2-country-2.22.2/keyboard/src/modules/Keyboard.ycp 2011-07-11 16:48:58.000000000 +0200 +++ new/yast2-country-2.22.4/keyboard/src/modules/Keyboard.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * Keyboard.ycp @@ -13,7 +33,7 @@ * * Maintainer: Jiri Suchomel <jsuch...@suse.cz> * - * $Id: Keyboard.ycp 64775 2011-07-11 14:48:56Z jsuchome $ + * $Id: Keyboard.ycp 67149 2012-01-12 08:37:15Z jsuchome $ * * Usage: * ------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/keyboard/src/proposal/keyboard_proposal.ycp new/yast2-country-2.22.4/keyboard/src/proposal/keyboard_proposal.ycp --- old/yast2-country-2.22.2/keyboard/src/proposal/keyboard_proposal.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.22.4/keyboard/src/proposal/keyboard_proposal.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,7 +1,27 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: keyboard_proposal.ycp * - * $Id: keyboard_proposal.ycp 25808 2005-10-05 15:13:41Z jsuchome $ + * $Id: keyboard_proposal.ycp 67149 2012-01-12 08:37:15Z jsuchome $ * * Author: Klaus Kaempf <kkae...@suse.de> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/keyboard/src/proposal/keyboard_simple_proposal.ycp new/yast2-country-2.22.4/keyboard/src/proposal/keyboard_simple_proposal.ycp --- old/yast2-country-2.22.2/keyboard/src/proposal/keyboard_simple_proposal.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.22.4/keyboard/src/proposal/keyboard_simple_proposal.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,8 +1,28 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: keyboard_simple_proposal.ycp * Author: Jiri Suchomel <jsuch...@suse.cz> * Purpose: Simple keyboard proposal (for overview tab) - * $Id: keyboard_simple_proposal.ycp 31665 2006-06-26 14:24:27Z jsuchome $ + * $Id: keyboard_simple_proposal.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { textdomain "country"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/YaPI/LANGUAGE.pm new/yast2-country-2.22.4/language/src/YaPI/LANGUAGE.pm --- old/yast2-country-2.22.2/language/src/YaPI/LANGUAGE.pm 2009-08-07 16:00:25.000000000 +0200 +++ new/yast2-country-2.22.4/language/src/YaPI/LANGUAGE.pm 2012-01-12 09:32:23.000000000 +0100 @@ -1,3 +1,24 @@ +#-- +# Copyright (c) 2009-2012 Novell, Inc. +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +#++ + package YaPI::LANGUAGE; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/inst_language.ycp new/yast2-country-2.22.4/language/src/inst_language.ycp --- old/yast2-country-2.22.2/language/src/inst_language.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.22.4/language/src/inst_language.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,7 +1,27 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Client for initial language setting (part of installation sequence) * Author: Jiri Suchomel <jsuch...@suse.cz> - * $Id: inst_language.ycp 25808 2005-10-05 15:13:41Z jsuchome $ + * $Id: inst_language.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { import "GetInstArgs"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/language.ycp new/yast2-country-2.22.4/language/src/language.ycp --- old/yast2-country-2.22.2/language/src/language.ycp 2010-11-08 20:04:17.000000000 +0100 +++ new/yast2-country-2.22.4/language/src/language.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * * Module: yast2-country @@ -7,7 +27,7 @@ * * Purpose: client for language configuration in running system * - * $Id: language.ycp 62766 2010-11-08 16:09:36Z lslezak $ + * $Id: language.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { @@ -16,7 +36,6 @@ import "CommandLine"; import "Console"; -import "GfxMenu"; import "Keyboard"; import "Language"; import "Mode"; @@ -99,7 +118,7 @@ // the texts in GfxMenu can be translated (bnc#446982) Language::WfmSetLanguage (); - GfxMenu::Update(); + WFM::CallFunction ("bootloader_proposal", [ "UpdateGfxMenu" ]); if (Keyboard::Modified ()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/language_auto.ycp new/yast2-country-2.22.4/language/src/language_auto.ycp --- old/yast2-country-2.22.2/language/src/language_auto.ycp 2009-06-01 13:16:04.000000000 +0200 +++ new/yast2-country-2.22.4/language/src/language_auto.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,8 +1,28 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Autoinstallation client for language setting * Author : Jiri Suchomel <jsuch...@suse.cz> * - * $Id: language_auto.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: language_auto.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { import "Language"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/modules/Language.ycp new/yast2-country-2.22.4/language/src/modules/Language.ycp --- old/yast2-country-2.22.2/language/src/modules/Language.ycp 2011-11-14 13:58:49.000000000 +0100 +++ new/yast2-country-2.22.4/language/src/modules/Language.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: modules/Language.ycp * Module: Language @@ -6,7 +26,7 @@ * Thomas Roelz <t...@suse.de> * Maintainer: Jiri Suchomel <jsuch...@suse.cz> * - * $Id: Language.ycp 66793 2011-11-14 12:58:47Z jsuchome $ + * $Id: Language.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/proposal/country_simple_proposal.ycp new/yast2-country-2.22.4/language/src/proposal/country_simple_proposal.ycp --- old/yast2-country-2.22.2/language/src/proposal/country_simple_proposal.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.22.4/language/src/proposal/country_simple_proposal.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,9 +1,29 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: country_simple_proposal.ycp * Author: Jiri Suchomel <jsuch...@suse.cz> * Purpose: Proposal for both language and keyboard layout settings. * - * $Id: country_simple_proposal.ycp 33046 2006-09-22 08:18:34Z jsuchome $ + * $Id: country_simple_proposal.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { textdomain "country"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/proposal/language_proposal.ycp new/yast2-country-2.22.4/language/src/proposal/language_proposal.ycp --- old/yast2-country-2.22.2/language/src/proposal/language_proposal.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.22.4/language/src/proposal/language_proposal.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,7 +1,27 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: language_proposal.ycp * - * $Id: language_proposal.ycp 26747 2006-01-03 17:32:59Z jsuchome $ + * $Id: language_proposal.ycp 67149 2012-01-12 08:37:15Z jsuchome $ * * Author: Klaus Kaempf <kkae...@suse.de> * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/proposal/language_simple_proposal.ycp new/yast2-country-2.22.4/language/src/proposal/language_simple_proposal.ycp --- old/yast2-country-2.22.2/language/src/proposal/language_simple_proposal.ycp 2008-12-18 14:47:04.000000000 +0100 +++ new/yast2-country-2.22.4/language/src/proposal/language_simple_proposal.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,9 +1,28 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ /** * File: language_simple_proposal.ycp * Author: Jiri Suchomel <jsuch...@suse.cz> * Purpose: Simple language proposal. * - * $Id: language_simple_proposal.ycp 27936 2006-02-13 20:01:14Z olh $ + * $Id: language_simple_proposal.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { import "Language"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/language/src/select_language.ycp new/yast2-country-2.22.4/language/src/select_language.ycp --- old/yast2-country-2.22.2/language/src/select_language.ycp 2011-09-21 10:46:47.000000000 +0200 +++ new/yast2-country-2.22.4/language/src/select_language.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,24 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + + /** * File: * select_language.ycp @@ -15,7 +36,7 @@ * Summary: * This client shows main dialog for choosing the language. * - * $Id: select_language.ycp 65870 2011-09-21 08:45:35Z visnov $ + * $Id: select_language.ycp 67149 2012-01-12 08:37:15Z jsuchome $ * */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/timezone/src/Timezone.ycp new/yast2-country-2.22.4/timezone/src/Timezone.ycp --- old/yast2-country-2.22.2/timezone/src/Timezone.ycp 2011-02-22 10:30:06.000000000 +0100 +++ new/yast2-country-2.22.4/timezone/src/Timezone.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,22 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ /** * File: modules/Timezone.ycp * Package: Country settings @@ -5,7 +24,7 @@ * Authors: Klaus Kaempf <kkae...@suse.de> * Thomas Roelz <t...@suse.de> * - * $Id: Timezone.ycp 63451 2011-02-22 09:30:04Z jsuchome $ + * $Id: Timezone.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/timezone/src/YaPI/TIME.pm new/yast2-country-2.22.4/timezone/src/YaPI/TIME.pm --- old/yast2-country-2.22.2/timezone/src/YaPI/TIME.pm 2010-05-06 12:50:57.000000000 +0200 +++ new/yast2-country-2.22.4/timezone/src/YaPI/TIME.pm 2012-01-12 09:34:00.000000000 +0100 @@ -1,3 +1,24 @@ +#-- +# Copyright (c) 2009-2012 Novell, Inc. +# +# All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.novell.com +#++ + package YaPI::TIME; use strict; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/timezone/src/dialogs.ycp new/yast2-country-2.22.4/timezone/src/dialogs.ycp --- old/yast2-country-2.22.2/timezone/src/dialogs.ycp 2011-11-25 14:54:21.000000000 +0100 +++ new/yast2-country-2.22.4/timezone/src/dialogs.ycp 2012-01-12 15:22:05.000000000 +0100 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * timezone/dialogs.ycp @@ -11,7 +31,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 66955 2011-11-25 13:54:20Z jsuchome $ + * $Id: dialogs.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { textdomain "country"; @@ -713,6 +733,15 @@ to daylight saving time and back automatically. </p> "); + + // help text: extra note about localtim + help_text = help_text + _("<p> +Note: The internal system clock as used by the Linux kernel must +always be in UTC, because this is the reference for the correct localtime +in user space. If you are choosing localtime for CMOS clock, +check the user manual for background information about side effects. +</p>"); + } @@ -825,6 +854,26 @@ { hwclock_s = ((boolean)UI::QueryWidget( `id(`hwclock), `Value))? `hwclock_utc : `hwclock_localtime; + + if (ret == `next && !Timezone::windows_partition && hwclock_s == `hwclock_localtime) + { + // warning popup, in case local time is selected (bnc#732769) + if (!Popup::ContinueCancel (_(" +You selected local time, but only Linux seems to be installed on your system. +In such case, it is strongly recommended to use UTC, and to click Cancel. + +If you want to keep local time, you must adjust the CMOS clock twice the year +because of Day Light Saving switches. If you miss to adjust the clock, backups may fail, +your mail system may drop mail messages, etc. + +If you use UTC, the Linux will adjust the time automatically. + +Do you want to continue with your selection (local time)?"))) + { + ret = `not_next; + continue; + } + } } if (ret == `timezonemap) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/timezone/src/inst_timezone.ycp new/yast2-country-2.22.4/timezone/src/inst_timezone.ycp --- old/yast2-country-2.22.2/timezone/src/inst_timezone.ycp 2009-06-01 13:16:04.000000000 +0200 +++ new/yast2-country-2.22.4/timezone/src/inst_timezone.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,7 +1,26 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ /** * Client for initial timezone setting (part of installation sequence) * Author: Jiri Suchomel <jsuch...@suse.cz> - * $Id: inst_timezone.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: inst_timezone.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { import "GetInstArgs"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/timezone/src/timezone.ycp new/yast2-country-2.22.4/timezone/src/timezone.ycp --- old/yast2-country-2.22.2/timezone/src/timezone.ycp 2011-06-02 10:37:38.000000000 +0200 +++ new/yast2-country-2.22.4/timezone/src/timezone.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,3 +1,22 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ /* * * Module: timezone.ycp @@ -12,7 +31,7 @@ * Modify: * * - * $Id: timezone.ycp 64199 2011-06-02 08:37:37Z jsuchome $ + * $Id: timezone.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-country-2.22.2/timezone/src/timezone_auto.ycp new/yast2-country-2.22.4/timezone/src/timezone_auto.ycp --- old/yast2-country-2.22.2/timezone/src/timezone_auto.ycp 2009-06-01 13:16:04.000000000 +0200 +++ new/yast2-country-2.22.4/timezone/src/timezone_auto.ycp 2012-01-12 09:37:18.000000000 +0100 @@ -1,8 +1,27 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ /** * Autoinstallation client for timezone setting * Author : Jiri Suchomel <jsuch...@suse.cz> * - * $Id: timezone_auto.ycp 57028 2009-04-29 10:58:09Z lslezak $ + * $Id: timezone_auto.ycp 67149 2012-01-12 08:37:15Z jsuchome $ */ { import "Mode"; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org