The Date and Time Indicator

Merge lp:~ubuntu-desktop/indicator-datetime/ubuntu into lp:~indicator-applet-developers/indicator-datetime/ubuntu

Proposed by Ken VanDine on 2011-02-09
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2011-02-09 Pending
Review via email: mp+49095@code.launchpad.net

Description of the Change

Updated build depends for eds support and merged with trunk

To post a comment you must log in.
58. By Ted Gould on 2011-02-09

Merging in U. Desktop changes

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-09 04:25:27 +0000
3+++ debian/changelog 2011-02-09 17:17:36 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 indicator-datetime (0.1.92-0ubuntu5~ppa1) natty; urgency=low
7
8 * Upstream Merge
9@@ -198,3 +199,206 @@
10 * Initial packaging
11
12 -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jan 2010 12:13:00 +0100
13+=======
14+indicator-datetime (0.1.92-0ubuntu4+r41) UNRELEASED; urgency=low
15+
16+ * New upstream snapshot
17+ * debian/control
18+ - New build deps for eds integration, libecal1.2-dev, libical-dev,
19+ libgtk2.0-dev, libcairo2-dev, libedataserver1.2-dev
20+
21+ -- Ken VanDine <ken.vandine@canonical.com> Wed, 09 Feb 2011 12:11:45 -0500
22+
23+indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
24+
25+ * debian/source/format
26+ - Source format v1 instead of v3
27+
28+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 13:59:35 -0500
29+
30+indicator-datetime (0.1.92-0ubuntu3) natty; urgency=low
31+
32+ * debian/control
33+ - Bump standards version to 3.9.1
34+ - Set Vcs-Bzr
35+ * +debian/source/format
36+
37+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:14:02 -0500
38+
39+indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low
40+
41+ * debian/control
42+ - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763)
43+ * src/datetime-service.c
44+ - Don't crash if we can get a geoclue provider (LP: #714763)
45+
46+ -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:02:31 -0500
47+
48+indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low
49+
50+ * New upstream release.
51+ * Increase robustness of GeoClue error handling
52+ * Remove g_error()'s from the .so
53+
54+ -- Ted Gould <ted@ubuntu.com> Thu, 03 Feb 2011 15:10:43 -0600
55+
56+indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low
57+
58+ * New upstream release.
59+ * Change to canonical.com for naming
60+ * Fixing a type callback
61+ * Switching to GDbus and dbusmenu-0.4
62+ * Supporting a wider range of custom strings for time and support
63+ seconds in the custom time strings.
64+ * Fixing to take time settings from LC_TIME
65+
66+ -- Ted Gould <ted@ubuntu.com> Thu, 27 Jan 2011 16:48:48 -0600
67+
68+indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
69+
70+ * debian/control
71+ - Bump build depends for libdbusmenu-* to >= 0.3.90
72+
73+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 09 Dec 2010 11:46:00 -0500
74+
75+indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
76+
77+ * New upstream release.
78+ * Generate the format string at init
79+ * Add in Geoclue support for setting proper timezone
80+ * Add support for building GTK2 and GTK3 versions
81+ * debian/control: Add recommends for geoclue-ubuntu-geoip
82+ * debian/control: Adding dependencies on Geoclue and OOBS
83+
84+ -- Ted Gould <ted@ubuntu.com> Fri, 03 Dec 2010 13:46:32 -0600
85+
86+indicator-datetime (0.1.90.is.0.0.6-0ubuntu2) natty; urgency=low
87+
88+ * Merged gdbus and dbusmenu-glib-0.4 port
89+ * debian/control
90+ - Added build depends for dh-autoreconf
91+ - bumped dbusmenu build depends to >= 0.3.91
92+ * debian/rules
93+ - Added autoreconf.mk
94+
95+ -- Ken VanDine <ken.vandine@canonical.com> Thu, 13 Jan 2011 20:48:31 -0600
96+
97+indicator-datetime (0.1.90.is.0.0.6-0ubuntu1) natty; urgency=low
98+
99+ * Uploading 0.0.6 again to superceed 0.1.90 which is still blocked on
100+ MIR
101+
102+ -- Ken VanDine <ken.vandine@canonical.com> Mon, 13 Dec 2010 11:30:25 -0500
103+
104+indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low
105+
106+ * Cherry-picked from upstream:
107+ - Fix date string format (12/24h) not taken from translation (LP: #579134)
108+
109+ -- Didier Roche <didrocks@ubuntu.com> Thu, 30 Sep 2010 16:09:41 +0200
110+
111+indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low
112+
113+ * Rebuild for libindicator ABI change (LP: #637692)
114+ * debian/control: depends on latest libindicator-dev
115+
116+ -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 18:21:26 +0200
117+
118+indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low
119+
120+ * New upstream release.
121+ * Refresh times on timezone change
122+ * Update the date daily (lp: #614529)
123+ * Fixing distcheck
124+
125+ -- Ted Gould <ted@ubuntu.com> Thu, 09 Sep 2010 13:10:10 -0500
126+
127+indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low
128+
129+ * debian/rules: use gnome.mk so a translation template is built (lp: #612540)
130+
131+ -- Sebastien Bacher <seb128@ubuntu.com> Tue, 03 Aug 2010 12:41:08 +0200
132+
133+indicator-datetime (0.0.5-0ubuntu1) maverick; urgency=low
134+
135+ * New version update
136+
137+ [ Ted Gould ]
138+ * Upstream Merge
139+ * Making time format configurable via translations and
140+ gsettings.
141+ * debian/control: Adding in a glib dependency to get gsettings
142+ * Autogen update
143+
144+ -- Sebastien Bacher <seb128@ubuntu.com> Thu, 22 Jul 2010 21:41:12 +0200
145+
146+indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low
147+
148+ * New upstream release.
149+ * Change menus to come from the service
150+
151+ -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:33:14 -0500
152+
153+indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low
154+
155+ [ Ted Gould ]
156+ * New upstream release.
157+ * Copyright fixes
158+ * Adding translations
159+ * Fix translation domain
160+
161+ [ Didier Roche ]
162+ * debian/control:
163+ - bump Standards-Version to latest
164+ - fix homepage url
165+ - remove uneeded pkg-config build-dep
166+ - Recommends: indicator-applet | indicator-renderer
167+
168+ -- Didier Roche <didrocks@ubuntu.com> Mon, 07 Jun 2010 10:24:51 +0200
169+
170+indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low
171+
172+ * New upstream release.
173+
174+ -- Didier Roche <didrocks@ubuntu.com> Thu, 03 Jun 2010 17:44:45 +0200
175+
176+indicator-datetime (0.0.2-0ubuntu1~ppa1) lucid; urgency=low
177+
178+ * New upstream release.
179+ * Making label guess and reasonable width starting out.
180+
181+ -- Ted Gould <ted@ubuntu.com> Thu, 04 Mar 2010 12:04:55 -0600
182+
183+indicator-datetime (0.0.1-0ubuntu1) lucid; urgency=low
184+
185+ * New upstream release.
186+ * debian/control:
187+ - add libdbusmenu-gtk-dev build-dep (/!\ not in configure.ac)
188+
189+ -- Didier Roche <didrocks@ubuntu.com> Fri, 26 Feb 2010 10:41:22 +0100
190+
191+indicator-datetime (0.0.1~r2-0ubuntu3) lucid; urgency=low
192+
193+ * debian/control: Adding libdbusmenu-gtk as a build dep
194+
195+ -- Ted Gould <ted@ubuntu.com> Thu, 18 Feb 2010 10:47:29 -0600
196+
197+indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low
198+
199+ * debian/control:
200+ - fix build-dep
201+
202+ -- Didier Roche <didrocks@ubuntu.com> Thu, 11 Feb 2010 20:27:22 +0100
203+
204+indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low
205+
206+ * new upstream version
207+
208+ -- Didier Roche <didrocks@ubuntu.com> Wed, 10 Feb 2010 12:10:48 +0100
209+
210+indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low
211+
212+ * Initial packaging
213+
214+ -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jan 2010 12:13:00 +0100
215+>>>>>>> MERGE-SOURCE
216
217=== modified file 'debian/control'
218--- debian/control 2011-02-08 16:48:27 +0000
219+++ debian/control 2011-02-09 17:17:36 +0000
220@@ -1,3 +1,4 @@
221+<<<<<<< TREE
222 Source: indicator-datetime
223 Section: misc
224 Priority: optional
225@@ -25,3 +26,37 @@
226 Description: A very, very simple clock
227 A simple clock appearing in the indicator bar
228
229+=======
230+Source: indicator-datetime
231+Section: misc
232+Priority: optional
233+Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
234+Build-Depends: cdbs,
235+ debhelper (>= 5),
236+ intltool (>= 0.35.0),
237+ libindicator-dev (>= 0.3.14),
238+ libdbusmenu-glib-dev (>= 0.3.90),
239+ libdbusmenu-gtk-dev (>= 0.3.90),
240+ libglib2.0-dev (>= 2.25.0),
241+ libido-0.1-dev (>= 0.1.10),
242+ libgeoclue-dev (>= 0.12.0),
243+ liboobs-1-dev (>= 2.31.0),
244+ libecal1.2-dev (>= 2.30),
245+ libical-dev (>= 0.44),
246+ libgtk2.0-dev (>= 2.22),
247+ libcairo2-dev (>= 1.10),
248+ libedataserver1.2-dev (>= 2.30)
249+Standards-Version: 3.9.1
250+Homepage: https://launchpad.net/indicator-datetime
251+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu
252+
253+Package: indicator-datetime
254+Architecture: any
255+Depends: ${shlibs:Depends},
256+ ${misc:Depends},
257+ geoclue-ubuntu-geoip | geoclue-provider
258+Recommends: indicator-applet | indicator-renderer
259+Description: A very, very simple clock
260+ A simple clock appearing in the indicator bar
261+
262+>>>>>>> MERGE-SOURCE
263
264=== modified file 'src/datetime-service.c'
265--- src/datetime-service.c 2011-02-09 04:23:44 +0000
266+++ src/datetime-service.c 2011-02-09 17:17:36 +0000
267@@ -806,9 +806,18 @@
268 g_debug("Created Geoclue client at: %s", path);
269
270 geo_master = client;
271+<<<<<<< TREE
272
273 g_return_if_fail(geo_master != NULL);
274
275+=======
276+
277+ if (geo_master != NULL) {
278+ g_warning(_("Unable to get a GeoClue client! Geolocation based timezone support will not be available."));
279+ return;
280+ }
281+
282+>>>>>>> MERGE-SOURCE
283 g_object_ref(G_OBJECT(geo_master));
284
285 /* New client, make sure we don't have an address hanging on */

Subscribers

People subscribed via source and target branches

to all changes: