Indicator Date and Time

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

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ken VanDine
Status: Merged
Merged at revision: 58
Proposed branch: lp:~ubuntu-desktop/indicator-datetime/ubuntu
Merge into: lp:~indicator-applet-developers/indicator-datetime/ubuntu
Diff against target: 285 lines (+248/-0) (has conflicts)
3 files modified
debian/changelog (+204/-0)
debian/control (+35/-0)
src/datetime-service.c (+9/-0)
Text conflict in debian/changelog
Text conflict in debian/control
Text conflict in src/datetime-service.c
To merge this branch: bzr merge lp:~ubuntu-desktop/indicator-datetime/ubuntu
Reviewer Review Type Date Requested Status
Indicator Applet Developers 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.
lp:~ubuntu-desktop/indicator-datetime/ubuntu updated
58. By Ted Gould

Merging in U. Desktop changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-09 04:25:27 +0000
+++ debian/changelog 2011-02-09 17:17:36 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1indicator-datetime (0.1.92-0ubuntu5~ppa1) natty; urgency=low2indicator-datetime (0.1.92-0ubuntu5~ppa1) natty; urgency=low
23
3 * Upstream Merge4 * Upstream Merge
@@ -198,3 +199,206 @@
198 * Initial packaging199 * Initial packaging
199200
200 -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jan 2010 12:13:00 +0100201 -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jan 2010 12:13:00 +0100
202=======
203indicator-datetime (0.1.92-0ubuntu4+r41) UNRELEASED; urgency=low
204
205 * New upstream snapshot
206 * debian/control
207 - New build deps for eds integration, libecal1.2-dev, libical-dev,
208 libgtk2.0-dev, libcairo2-dev, libedataserver1.2-dev
209
210 -- Ken VanDine <ken.vandine@canonical.com> Wed, 09 Feb 2011 12:11:45 -0500
211
212indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
213
214 * debian/source/format
215 - Source format v1 instead of v3
216
217 -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 13:59:35 -0500
218
219indicator-datetime (0.1.92-0ubuntu3) natty; urgency=low
220
221 * debian/control
222 - Bump standards version to 3.9.1
223 - Set Vcs-Bzr
224 * +debian/source/format
225
226 -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:14:02 -0500
227
228indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low
229
230 * debian/control
231 - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763)
232 * src/datetime-service.c
233 - Don't crash if we can get a geoclue provider (LP: #714763)
234
235 -- Ken VanDine <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:02:31 -0500
236
237indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low
238
239 * New upstream release.
240 * Increase robustness of GeoClue error handling
241 * Remove g_error()'s from the .so
242
243 -- Ted Gould <ted@ubuntu.com> Thu, 03 Feb 2011 15:10:43 -0600
244
245indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low
246
247 * New upstream release.
248 * Change to canonical.com for naming
249 * Fixing a type callback
250 * Switching to GDbus and dbusmenu-0.4
251 * Supporting a wider range of custom strings for time and support
252 seconds in the custom time strings.
253 * Fixing to take time settings from LC_TIME
254
255 -- Ted Gould <ted@ubuntu.com> Thu, 27 Jan 2011 16:48:48 -0600
256
257indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
258
259 * debian/control
260 - Bump build depends for libdbusmenu-* to >= 0.3.90
261
262 -- Ken VanDine <ken.vandine@canonical.com> Thu, 09 Dec 2010 11:46:00 -0500
263
264indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
265
266 * New upstream release.
267 * Generate the format string at init
268 * Add in Geoclue support for setting proper timezone
269 * Add support for building GTK2 and GTK3 versions
270 * debian/control: Add recommends for geoclue-ubuntu-geoip
271 * debian/control: Adding dependencies on Geoclue and OOBS
272
273 -- Ted Gould <ted@ubuntu.com> Fri, 03 Dec 2010 13:46:32 -0600
274
275indicator-datetime (0.1.90.is.0.0.6-0ubuntu2) natty; urgency=low
276
277 * Merged gdbus and dbusmenu-glib-0.4 port
278 * debian/control
279 - Added build depends for dh-autoreconf
280 - bumped dbusmenu build depends to >= 0.3.91
281 * debian/rules
282 - Added autoreconf.mk
283
284 -- Ken VanDine <ken.vandine@canonical.com> Thu, 13 Jan 2011 20:48:31 -0600
285
286indicator-datetime (0.1.90.is.0.0.6-0ubuntu1) natty; urgency=low
287
288 * Uploading 0.0.6 again to superceed 0.1.90 which is still blocked on
289 MIR
290
291 -- Ken VanDine <ken.vandine@canonical.com> Mon, 13 Dec 2010 11:30:25 -0500
292
293indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low
294
295 * Cherry-picked from upstream:
296 - Fix date string format (12/24h) not taken from translation (LP: #579134)
297
298 -- Didier Roche <didrocks@ubuntu.com> Thu, 30 Sep 2010 16:09:41 +0200
299
300indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low
301
302 * Rebuild for libindicator ABI change (LP: #637692)
303 * debian/control: depends on latest libindicator-dev
304
305 -- Didier Roche <didrocks@ubuntu.com> Wed, 22 Sep 2010 18:21:26 +0200
306
307indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low
308
309 * New upstream release.
310 * Refresh times on timezone change
311 * Update the date daily (lp: #614529)
312 * Fixing distcheck
313
314 -- Ted Gould <ted@ubuntu.com> Thu, 09 Sep 2010 13:10:10 -0500
315
316indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low
317
318 * debian/rules: use gnome.mk so a translation template is built (lp: #612540)
319
320 -- Sebastien Bacher <seb128@ubuntu.com> Tue, 03 Aug 2010 12:41:08 +0200
321
322indicator-datetime (0.0.5-0ubuntu1) maverick; urgency=low
323
324 * New version update
325
326 [ Ted Gould ]
327 * Upstream Merge
328 * Making time format configurable via translations and
329 gsettings.
330 * debian/control: Adding in a glib dependency to get gsettings
331 * Autogen update
332
333 -- Sebastien Bacher <seb128@ubuntu.com> Thu, 22 Jul 2010 21:41:12 +0200
334
335indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low
336
337 * New upstream release.
338 * Change menus to come from the service
339
340 -- Ted Gould <ted@ubuntu.com> Thu, 15 Jul 2010 10:33:14 -0500
341
342indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low
343
344 [ Ted Gould ]
345 * New upstream release.
346 * Copyright fixes
347 * Adding translations
348 * Fix translation domain
349
350 [ Didier Roche ]
351 * debian/control:
352 - bump Standards-Version to latest
353 - fix homepage url
354 - remove uneeded pkg-config build-dep
355 - Recommends: indicator-applet | indicator-renderer
356
357 -- Didier Roche <didrocks@ubuntu.com> Mon, 07 Jun 2010 10:24:51 +0200
358
359indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low
360
361 * New upstream release.
362
363 -- Didier Roche <didrocks@ubuntu.com> Thu, 03 Jun 2010 17:44:45 +0200
364
365indicator-datetime (0.0.2-0ubuntu1~ppa1) lucid; urgency=low
366
367 * New upstream release.
368 * Making label guess and reasonable width starting out.
369
370 -- Ted Gould <ted@ubuntu.com> Thu, 04 Mar 2010 12:04:55 -0600
371
372indicator-datetime (0.0.1-0ubuntu1) lucid; urgency=low
373
374 * New upstream release.
375 * debian/control:
376 - add libdbusmenu-gtk-dev build-dep (/!\ not in configure.ac)
377
378 -- Didier Roche <didrocks@ubuntu.com> Fri, 26 Feb 2010 10:41:22 +0100
379
380indicator-datetime (0.0.1~r2-0ubuntu3) lucid; urgency=low
381
382 * debian/control: Adding libdbusmenu-gtk as a build dep
383
384 -- Ted Gould <ted@ubuntu.com> Thu, 18 Feb 2010 10:47:29 -0600
385
386indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low
387
388 * debian/control:
389 - fix build-dep
390
391 -- Didier Roche <didrocks@ubuntu.com> Thu, 11 Feb 2010 20:27:22 +0100
392
393indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low
394
395 * new upstream version
396
397 -- Didier Roche <didrocks@ubuntu.com> Wed, 10 Feb 2010 12:10:48 +0100
398
399indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low
400
401 * Initial packaging
402
403 -- Didier Roche <didrocks@ubuntu.com> Wed, 27 Jan 2010 12:13:00 +0100
404>>>>>>> MERGE-SOURCE
201405
=== modified file 'debian/control'
--- debian/control 2011-02-08 16:48:27 +0000
+++ debian/control 2011-02-09 17:17:36 +0000
@@ -1,3 +1,4 @@
1<<<<<<< TREE
1Source: indicator-datetime2Source: indicator-datetime
2Section: misc3Section: misc
3Priority: optional4Priority: optional
@@ -25,3 +26,37 @@
25Description: A very, very simple clock26Description: A very, very simple clock
26 A simple clock appearing in the indicator bar27 A simple clock appearing in the indicator bar
2728
29=======
30Source: indicator-datetime
31Section: misc
32Priority: optional
33Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
34Build-Depends: cdbs,
35 debhelper (>= 5),
36 intltool (>= 0.35.0),
37 libindicator-dev (>= 0.3.14),
38 libdbusmenu-glib-dev (>= 0.3.90),
39 libdbusmenu-gtk-dev (>= 0.3.90),
40 libglib2.0-dev (>= 2.25.0),
41 libido-0.1-dev (>= 0.1.10),
42 libgeoclue-dev (>= 0.12.0),
43 liboobs-1-dev (>= 2.31.0),
44 libecal1.2-dev (>= 2.30),
45 libical-dev (>= 0.44),
46 libgtk2.0-dev (>= 2.22),
47 libcairo2-dev (>= 1.10),
48 libedataserver1.2-dev (>= 2.30)
49Standards-Version: 3.9.1
50Homepage: https://launchpad.net/indicator-datetime
51Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu
52
53Package: indicator-datetime
54Architecture: any
55Depends: ${shlibs:Depends},
56 ${misc:Depends},
57 geoclue-ubuntu-geoip | geoclue-provider
58Recommends: indicator-applet | indicator-renderer
59Description: A very, very simple clock
60 A simple clock appearing in the indicator bar
61
62>>>>>>> MERGE-SOURCE
2863
=== modified file 'src/datetime-service.c'
--- src/datetime-service.c 2011-02-09 04:23:44 +0000
+++ src/datetime-service.c 2011-02-09 17:17:36 +0000
@@ -806,9 +806,18 @@
806 g_debug("Created Geoclue client at: %s", path);806 g_debug("Created Geoclue client at: %s", path);
807807
808 geo_master = client;808 geo_master = client;
809<<<<<<< TREE
809810
810 g_return_if_fail(geo_master != NULL);811 g_return_if_fail(geo_master != NULL);
811812
813=======
814
815 if (geo_master != NULL) {
816 g_warning(_("Unable to get a GeoClue client! Geolocation based timezone support will not be available."));
817 return;
818 }
819
820>>>>>>> MERGE-SOURCE
812 g_object_ref(G_OBJECT(geo_master));821 g_object_ref(G_OBJECT(geo_master));
813822
814 /* New client, make sure we don't have an address hanging on */823 /* New client, make sure we don't have an address hanging on */

Subscribers

People subscribed via source and target branches