Mailinglist Archive: opensuse-commit (918 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package yast2-ntp-client
checked in at Tue Feb 6 19:19:48 CET 2007.

--------
--- yast2-ntp-client/yast2-ntp-client.changes	2007-01-22 12:36:13.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ntp-client/yast2-ntp-client.changes	2007-02-06 11:21:40.370958000 +0100
@@ -1,0 +2,6 @@
+Tue Feb  6 11:09:08 CET 2007 - kmachalkova@xxxxxxx
+
+- Merged 'Great Britain' and 'UK' public ntp server lists (#241054)
+- 2.15.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-ntp-client-2.15.0.tar.bz2

New:
----
  yast2-ntp-client-2.15.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ntp-client.spec ++++++
--- /var/tmp/diff_new_pack.Wo1945/_old	2007-02-06 19:19:44.000000000 +0100
+++ /var/tmp/diff_new_pack.Wo1945/_new	2007-02-06 19:19:44.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-ntp-client (Version 2.15.0)
+# spec file for package yast2-ntp-client (Version 2.15.1)
 #
 # 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-ntp-client
-Version:        2.15.0
+Version:        2.15.1
 Release:        1
 License:        GNU General Public License (GPL)
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ntp-client-2.15.0.tar.bz2
+Source0:        yast2-ntp-client-2.15.1.tar.bz2
 prefix:		/usr
 BuildRequires:  perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-slp yast2-testsuite
 Requires:       yast2 yast2-slp yast2-country
@@ -34,7 +34,7 @@
     Lukas Ocilka <locilka@xxxxxxx>
 
 %prep
-%setup -n yast2-ntp-client-2.15.0
+%setup -n yast2-ntp-client-2.15.1
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -72,6 +72,9 @@
 /usr/share/YaST2/schema/autoyast/rnc/ntpclient.rnc
 
 %changelog -n yast2-ntp-client
+* Tue Feb 06 2007 - kmachalkova@xxxxxxx
+- Merged 'Great Britain' and 'UK' public ntp server lists (#241054)
+- 2.15.1
 * Mon Jan 22 2007 - kmachalkova@xxxxxxx
 - Correct handling of switching between simple and advanced config
   (display current server entries in server table) (#230240)

++++++ yast2-ntp-client-2.15.0.tar.bz2 -> yast2-ntp-client-2.15.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.0/src/NtpClient.ycp new/yast2-ntp-client-2.15.1/src/NtpClient.ycp
--- old/yast2-ntp-client-2.15.0/src/NtpClient.ycp	2006-11-06 14:17:51.000000000 +0100
+++ new/yast2-ntp-client-2.15.1/src/NtpClient.ycp	2007-02-06 11:15:08.000000000 +0100
@@ -4,7 +4,7 @@
  * Summary:	Data for configuration of ntp-client, input and output functions.
  * Authors:	Jiri Srain <jsrain@xxxxxxx>
  *
- * $Id: NtpClient.ycp 34082 2006-11-06 13:17:48Z kmachalkova $
+ * $Id: NtpClient.ycp 35887 2007-02-06 10:15:05Z kmachalkova $
  *
  * Representation of the configuration of ntp-client.
  * Input and output routines.
@@ -151,7 +151,14 @@
 	countries_already_read = true;
 	if (known_countries == nil) known_countries = $[];
     }
-    
+
+    //workaround bug #241054: servers in United Kingdom are in domain .uk
+    // domain .gb does not exist - add UK to the list of known countries
+    if (haskey(known_countries, "GB")){
+	known_countries["UK"] = known_countries["GB"]:"";
+	known_countries = remove(known_countries,"GB");
+    }
+
     return known_countries;
 }
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-ntp-client-2.15.0/VERSION new/yast2-ntp-client-2.15.1/VERSION
--- old/yast2-ntp-client-2.15.0/VERSION	2007-01-22 11:09:05.000000000 +0100
+++ new/yast2-ntp-client-2.15.1/VERSION	2007-02-06 11:09:03.000000000 +0100
@@ -1 +1 @@
-2.15.0
+2.15.1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx