Hello community, here is the log from the commit of package yast2-country for openSUSE:Factory checked in at Mon Jun 6 16:12:56 CEST 2011.
-------- --- yast2-country/yast2-country.changes 2011-02-22 10:30:25.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-country/yast2-country.changes 2011-06-02 10:38:13.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Jun 2 10:35:17 CEST 2011 - [email protected] + +- accept UTC as a value in 'set' command (bnc#697520) +- 2.21.0 + +------------------------------------------------------------------- +Mon Mar 21 15:36:28 CET 2011 - [email protected] + +- correct spelling for Kathmandu (bnc#681133) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-country-2.20.6.tar.bz2 New: ---- yast2-country-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-country.spec ++++++ --- /var/tmp/diff_new_pack.j5NMqP/_old 2011-06-06 16:02:34.000000000 +0200 +++ /var/tmp/diff_new_pack.j5NMqP/_new 2011-06-06 16:02:34.000000000 +0200 @@ -19,16 +19,16 @@ Name: yast2-country -Version: 2.20.6 +Version: 2.21.0 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-country-2.20.6.tar.bz2 +Source0: yast2-country-2.21.0.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later #policy files for YaPI dbus interface Source1: org.opensuse.yast.modules.yapi.time.policy Source2: org.opensuse.yast.modules.yapi.language.policy @@ -80,7 +80,7 @@ timezone) for yast2. %prep -%setup -n yast2-country-2.20.6 +%setup -n yast2-country-2.21.0 %build %{prefix}/bin/y2tool y2autoconf @@ -135,7 +135,7 @@ %attr(644,root,root) %config /usr/share/PolicyKit/policy/org.opensuse.yast.modules.yapi.*.policy %package data -License: GPLv2+ + Summary: YaST2 - Data files for Country settings Group: System/YaST ++++++ org.opensuse.yast.modules.yapi.language.policy ++++++ --- /var/tmp/diff_new_pack.j5NMqP/_old 2011-06-06 16:02:34.000000000 +0200 +++ /var/tmp/diff_new_pack.j5NMqP/_new 2011-06-06 16:02:34.000000000 +0200 @@ -5,7 +5,7 @@ <policyconfig> <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/YAST</vendor_url> + <vendor_url>http://en.opensuse.org/Portal:YaST</vendor_url> <!-- Rights for languages @@ -28,4 +28,4 @@ </defaults> </action> -</policyconfig> \ No newline at end of file +</policyconfig> ++++++ org.opensuse.yast.modules.yapi.time.policy ++++++ --- /var/tmp/diff_new_pack.j5NMqP/_old 2011-06-06 16:02:34.000000000 +0200 +++ /var/tmp/diff_new_pack.j5NMqP/_new 2011-06-06 16:02:34.000000000 +0200 @@ -5,7 +5,7 @@ <policyconfig> <vendor>YaST Webservice Project</vendor> - <vendor_url>http://en.opensuse.org/YAST</vendor_url> + <vendor_url>http://en.opensuse.org/Portal:YaST</vendor_url> <!-- Rights for system.time ++++++ yast2-country-2.20.6.tar.bz2 -> yast2-country-2.21.0.tar.bz2 ++++++ ++++ 1998 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.20.6/VERSION new/yast2-country-2.21.0/VERSION --- old/yast2-country-2.20.6/VERSION 2011-02-22 10:28:32.000000000 +0100 +++ new/yast2-country-2.21.0/VERSION 2011-06-02 10:36:06.000000000 +0200 @@ -1 +1 @@ -2.20.6 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.20.6/language/src/modules/Language.ycp new/yast2-country-2.21.0/language/src/modules/Language.ycp --- old/yast2-country-2.20.6/language/src/modules/Language.ycp 2010-11-08 20:04:17.000000000 +0100 +++ new/yast2-country-2.21.0/language/src/modules/Language.ycp 2011-06-02 10:37:15.000000000 +0200 @@ -6,7 +6,7 @@ * Thomas Roelz <[email protected]> * Maintainer: Jiri Suchomel <[email protected]> * - * $Id: Language.ycp 62766 2010-11-08 16:09:36Z lslezak $ + * $Id: Language.ycp 64198 2011-06-02 08:37:15Z jsuchome $ */ { @@ -291,7 +291,8 @@ if (pos != nil && pos >= 0) l = substring (l, 0, pos); - locales [l] = 1; + if (l != "") + locales [l] = 1; }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.20.6/timezone/data/timezone_raw.ycp new/yast2-country-2.21.0/timezone/data/timezone_raw.ycp --- old/yast2-country-2.20.6/timezone/data/timezone_raw.ycp 2011-02-21 09:42:01.000000000 +0100 +++ new/yast2-country-2.21.0/timezone/data/timezone_raw.ycp 2011-03-21 15:37:10.000000000 +0100 @@ -3,7 +3,7 @@ * Authors: Thomas Roelz <[email protected]> * Summary: The untranslated timezone database. * - * $Id: timezone_raw.ycp 62652 2010-10-19 12:42:35Z jsuchome $ + * $Id: timezone_raw.ycp 63623 2011-03-21 14:37:09Z jsuchome $ * * ***************************************************************** * In case of changes please keep the following files in sync: @@ -544,7 +544,7 @@ // time zone "Asia/Kashgar" : _("Kashgar"), // CN // time zone - "Asia/Kathmandu" : _("Katmandu"), + "Asia/Kathmandu" : _("Kathmandu"), // time zone "Asia/Krasnoyarsk" : _("Krasnoyarsk"), // time zone diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.20.6/timezone/src/Timezone.ycp new/yast2-country-2.21.0/timezone/src/Timezone.ycp --- old/yast2-country-2.20.6/timezone/src/Timezone.ycp 2011-02-21 16:24:58.000000000 +0100 +++ new/yast2-country-2.21.0/timezone/src/Timezone.ycp 2011-02-22 10:30:06.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Klaus Kaempf <[email protected]> * Thomas Roelz <[email protected]> * - * $Id: Timezone.ycp 62790 2010-11-10 07:10:15Z jsuchome $ + * $Id: Timezone.ycp 63451 2011-02-22 09:30:04Z jsuchome $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.20.6/timezone/src/dialogs.ycp new/yast2-country-2.21.0/timezone/src/dialogs.ycp --- old/yast2-country-2.20.6/timezone/src/dialogs.ycp 2011-02-21 16:25:37.000000000 +0100 +++ new/yast2-country-2.21.0/timezone/src/dialogs.ycp 2011-04-19 11:12:52.000000000 +0200 @@ -11,7 +11,7 @@ * Summary: * Dialogs for timeone and time configuration. * - * $Id: dialogs.ycp 62785 2010-11-09 14:48:32Z jsuchome $ + * $Id: dialogs.ycp 63814 2011-04-19 09:12:51Z jsuchome $ */ { textdomain "country"; @@ -714,10 +714,13 @@ } - // general help trailer - help_text = help_text + _("<p> + if (!Arch::s390 () && !Mode::config ()) + { + // general help trailer + help_text = help_text + _("<p> If the current time is not correct, use <b>Change</b> to adjust it. </p>"); + } // Screen title for timezone screen Wizard::SetContents (_("Clock and Time Zone"), contents, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-country-2.20.6/timezone/src/timezone.ycp new/yast2-country-2.21.0/timezone/src/timezone.ycp --- old/yast2-country-2.20.6/timezone/src/timezone.ycp 2008-12-18 14:47:05.000000000 +0100 +++ new/yast2-country-2.21.0/timezone/src/timezone.ycp 2011-06-02 10:33:00.000000000 +0200 @@ -133,7 +133,7 @@ } if (hwclock != "" && !Timezone::utc_only ()) { - Timezone::hwclock = hwclock == "utc" ? "-u" : "--localtime"; + Timezone::hwclock = tolower (hwclock) == "utc" ? "-u" : "--localtime"; } return (Timezone::Modified ()); } @@ -174,7 +174,7 @@ // command line help text for 'set hwclock' option "help" : _("New value for hardware clock"), "type" : "enum", - "typespec" : [ "local", "utc" ], + "typespec" : [ "local", "utc", "UTC" ], ], ], "mappings" : $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
