← Back to branch summary

~noskcaj/ubuntu/trusty/gnome-system-tools/regression-fix

« back to all changes in this revision

Viewing changes to debian/patches/96_ubuntu_ntp_pool.patch

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-02-08 16:46:57 UTC
  • Revision ID: james.westby@ubuntu.com-20110208164657-u3p1vo2zznrqo6n7
Tags: 2.32.0-0ubuntu5
https://launchpad.net/bugs/104525
Add 96_ubuntu_ntp_pool.patch: Offer Ubuntu specific NTP servers;
pool.ntp.org offers geolocation and automatic QA. Thanks Xavier Robin for
coordinating the setup of the Ubuntu ntp.org pool and preparing the patch!
(LP: #104525)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/96_ubuntu_ntp_pool.patch
 
1
Description: Offer Ubuntu specific NTP servers; pool.ntp.org offers geolocation and automatic QA
 
2
Author: Xavier Robin
 
3
Bug-Ubuntu: https://launchpad.net/bugs/104525
 
4
 
 
5
Index: gnome-system-tools-2.32.0/src/time/ntp-servers-list.c
 
6
===================================================================
 
7
--- gnome-system-tools-2.32.0.orig/src/time/ntp-servers-list.c  2011-02-08 16:32:06.411971650 +0100
 
8
+++ gnome-system-tools-2.32.0/src/time/ntp-servers-list.c       2011-02-08 16:33:37.912003021 +0100
 
9
@@ -34,58 +34,12 @@
 
10
 
 
11
 struct NtpServer {
 
12
        const gchar *url;
 
13
-       const gchar *location;
 
14
 } ntp_servers [] = {
 
15
-       { "time.nrc.ca", "Canada" },
 
16
-       { "ntp1.cmc.ec.gc.ca", "Eastern Canada" },
 
17
-       { "ntp2.cmc.ec.gc.ca", "Eastern Canada" },
 
18
-       { "wuarchive.wustl.edu", "Missouri, USA" },
 
19
-       { "clock.psu.edu", "Pennsylvania, USA" },
 
20
-       { "gilbreth.ecn.purdue.edu", "Indiana, USA" },
 
21
-       { "molecule.ecn.purdue.edu", "Indiana, USA" },
 
22
-       { "ntp.tmc.edu", "Texas, USA" },
 
23
-       { "louie.udel.edu", "Delaware, USA" },
 
24
-       { "ntp0.cornell.edu", "New York, USA" },
 
25
-       { "ntp-0.cso.uiuc.edu", "Illinois, USA" },
 
26
-       { "ntp1.cs.wisc.edu", "Wisconsin, USA" },
 
27
-       { "tick.cs.unlv.edu", "Las Vegas, USA" },
 
28
-       { "ntp2a.mcc.ac.uk", "England, Europe" },
 
29
-       { "ntp2b.mcc.ac.uk", "England, Europe" },
 
30
-       { "ntp.maths.tcd.ie", "Ireland, Europe" },
 
31
-       { "ntp.cs.strath.ac.uk", "Scotland, Europe" },
 
32
-       { "bernina.ethz.ch", "Switzerland, Europe" },
 
33
-       { "ntp.univ-lyon1.fr", "France, Europe" },
 
34
-       { "tick.keso.fi", "Finland, Europe" },
 
35
-       { "fartein.ifi.uio.no", "Norway, Europe" },
 
36
-       { "ntp1.arnes.si", "Slovenia, Europe" },
 
37
-       { "ntp2.arnes.si", "Slovenia, Europe" },
 
38
-       { "time.esec.com.au", "Australia" },
 
39
-       { "ntp.adelaide.edu.au", "South Australia" },
 
40
-       { "time.nuri.net", "Korea, Asia" },
 
41
-       { "ntp.cs.mu.oz.au", "Melbourne, Australia" },
 
42
-       { "swisstime.ethz.ch", "Zurich, Switzerland" },
 
43
-       { "ntp.cesnet.cz", "Prague, Czech Republic" },
 
44
-       { "ntpa2.kph.uni-mainz.de", "Mainz, Germany" },
 
45
-       { "ntps1-0.cs.tu-berlin.de", "Berlin, Germany" },
 
46
-       { "ntps1-1.cs.tu-berlin.de", "Berlin, Germany" },
 
47
-       { "ntps1-2.uni-erlangen.de", "Erlangen, Germany" },
 
48
-       { "canon.inria.fr", "Rocquencourt, France" },
 
49
-       { "chronos.cru.fr", "Britany, France" },
 
50
-       { "stdtime.gov.hk", "Hong Kong, China" },
 
51
-       { "clock.cuhk.edu.hk", "Hong Kong, China" },
 
52
-       { "time.ien.it", "Torino, Italy" },
 
53
-       { "ntp.jst.mfeed.ad.jp", "Japan" },
 
54
-       { "cronos.cenam.mx", "Queretaro, Mexico" },
 
55
-       { "ntp0.nl.net", "Amsterdam, The Netherlands" },
 
56
-       { "ntp1.nl.net", "Amsterdam, The Netherlands" },
 
57
-       { "ntp2.nl.net", "Amsterdam, The Netherlands" },
 
58
-       { "time.service.uit.no", "Norway" },
 
59
-       { "ntp.certum.pl", "Poland" },
 
60
-       { "vega.cbk.poznan.pl", "Borowiec, Poland" },
 
61
-       { "time1.stupi.se", "Stockholm, Sweden" },
 
62
-       { "goodtime.ijs.si", "Ljubljana, Slovenia" },
 
63
-       { "ntp2.ja.net", "United Kingdom" },
 
64
-       { "laikas.pfi.lt", "Lithuania" },
 
65
+       { "0.ubuntu.pool.ntp.org" },
 
66
+       { "1.ubuntu.pool.ntp.org" },
 
67
+       { "2.ubuntu.pool.ntp.org" },
 
68
+       { "3.ubuntu.pool.ntp.org" },
 
69
+       { "ntp.ubuntu.com" },
 
70
        { NULL }
 
71
 };
 
72
 
 
73
@@ -97,7 +51,7 @@
 
74
        gint i;
 
75
 
 
76
        for (i = 0; ntp_servers[i].url; i++) {
 
77
-               str = g_strdup_printf ("%s (%s)", ntp_servers[i].url, ntp_servers[i].location);
 
78
+               str = g_strdup_printf ("%s", ntp_servers[i].url);
 
79
 
 
80
                gtk_list_store_append (store, &iter);
 
81
                gtk_list_store_set (store, &iter,