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

[Ken VanDine]

Updated build depends for eds support and merged with trunk

=== 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 @@
+<<<<<<< TREE
 indicator-datetime (0.1.92-0ubuntu5~ppa1) natty; urgency=low
 
   * Upstream Merge
@@ -198,3 +199,206 @@
   * Initial packaging
 
  -- Didier Roche <[e-mail]>  Wed, 27 Jan 2010 12:13:00 +0100
+=======
+indicator-datetime (0.1.92-0ubuntu4+r41) UNRELEASED; urgency=low
+
+  * New upstream snapshot
+  * debian/control
+    - New build deps for eds integration, libecal1.2-dev, libical-dev, 
+      libgtk2.0-dev, libcairo2-dev, libedataserver1.2-dev
+
+ -- Ken VanDine <[e-mail]>  Wed, 09 Feb 2011 12:11:45 -0500
+
+indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low
+
+  * debian/source/format
+    - Source format v1 instead of v3
+
+ -- Ken VanDine <[e-mail]>  Tue, 08 Feb 2011 13:59:35 -0500
+
+indicator-datetime (0.1.92-0ubuntu3) natty; urgency=low
+
+  * debian/control
+    - Bump standards version to 3.9.1
+    - Set Vcs-Bzr
+  * +debian/source/format
+
+ -- Ken VanDine <[e-mail]>  Tue, 08 Feb 2011 11:14:02 -0500
+
+indicator-datetime (0.1.92-0ubuntu2) natty; urgency=low
+
+  * debian/control
+    - Depend on geoclue-ubuntu-geoip | geoclue-provider (LP: #714763)
+  * src/datetime-service.c
+    - Don't crash if we can get a geoclue provider (LP: #714763)
+
+ -- Ken VanDine <[e-mail]>  Tue, 08 Feb 2011 11:02:31 -0500
+
+indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Increase robustness of GeoClue error handling
+    * Remove g_error()'s from the .so
+
+ -- Ted Gould <[e-mail]>  Thu, 03 Feb 2011 15:10:43 -0600
+
+indicator-datetime (0.1.91-0ubuntu1~ppa1) natty; urgency=low
+
+  * New upstream release.
+    * Change to canonical.com for naming
+    * Fixing a type callback
+    * Switching to GDbus and dbusmenu-0.4
+    * Supporting a wider range of custom strings for time and support
+      seconds in the custom time strings.
+    * Fixing to take time settings from LC_TIME
+
+ -- Ted Gould <[e-mail]>  Thu, 27 Jan 2011 16:48:48 -0600
+
+indicator-datetime (0.1.90-0ubuntu2) natty; urgency=low
+
+  * debian/control
+    - Bump build depends for libdbusmenu-* to >= 0.3.90
+
+ -- Ken VanDine <[e-mail]>  Thu, 09 Dec 2010 11:46:00 -0500
+
+indicator-datetime (0.1.90-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    * Generate the format string at init
+    * Add in Geoclue support for setting proper timezone
+    * Add support for building GTK2 and GTK3 versions
+  * debian/control: Add recommends for geoclue-ubuntu-geoip
+  * debian/control: Adding dependencies on Geoclue and OOBS
+
+ -- Ted Gould <[e-mail]>  Fri, 03 Dec 2010 13:46:32 -0600
+
+indicator-datetime (0.1.90.is.0.0.6-0ubuntu2) natty; urgency=low
+
+  * Merged gdbus and dbusmenu-glib-0.4 port
+  * debian/control
+    - Added build depends for dh-autoreconf
+    - bumped dbusmenu build depends to >= 0.3.91
+  * debian/rules
+    - Added autoreconf.mk
+
+ -- Ken VanDine <[e-mail]>  Thu, 13 Jan 2011 20:48:31 -0600
+
+indicator-datetime (0.1.90.is.0.0.6-0ubuntu1) natty; urgency=low
+
+  * Uploading 0.0.6 again to superceed 0.1.90 which is still blocked on
+    MIR
+
+ -- Ken VanDine <[e-mail]>  Mon, 13 Dec 2010 11:30:25 -0500
+
+indicator-datetime (0.0.6-0ubuntu3) maverick; urgency=low
+
+  * Cherry-picked from upstream:
+    - Fix date string format (12/24h) not taken from translation (LP: #579134)
+
+ -- Didier Roche <[e-mail]>  Thu, 30 Sep 2010 16:09:41 +0200
+
+indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low
+
+  * Rebuild for libindicator ABI change (LP: #637692)
+  * debian/control: depends on latest libindicator-dev
+
+ -- Didier Roche <[e-mail]>  Wed, 22 Sep 2010 18:21:26 +0200
+
+indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Refresh times on timezone change
+    * Update the date daily (lp: #614529)
+    * Fixing distcheck
+
+ -- Ted Gould <[e-mail]>  Thu, 09 Sep 2010 13:10:10 -0500
+
+indicator-datetime (0.0.5-0ubuntu2) maverick; urgency=low
+
+  * debian/rules: use gnome.mk so a translation template is built (lp: #612540)
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 03 Aug 2010 12:41:08 +0200
+
+indicator-datetime (0.0.5-0ubuntu1) maverick; urgency=low
+
+  * New version update
+
+  [ Ted Gould ]
+  * Upstream Merge
+    * Making time format configurable via translations and
+      gsettings.
+  * debian/control: Adding in a glib dependency to get gsettings
+  * Autogen update
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 22 Jul 2010 21:41:12 +0200
+
+indicator-datetime (0.0.4-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+    * Change menus to come from the service
+
+ -- Ted Gould <[e-mail]>  Thu, 15 Jul 2010 10:33:14 -0500
+
+indicator-datetime (0.0.3-0ubuntu1) maverick; urgency=low
+
+  [ Ted Gould ]
+  * New upstream release.
+    * Copyright fixes
+    * Adding translations
+    * Fix translation domain
+
+  [ Didier Roche ]
+  * debian/control:
+    - bump Standards-Version to latest
+    - fix homepage url
+    - remove uneeded pkg-config build-dep
+    - Recommends: indicator-applet | indicator-renderer
+
+ -- Didier Roche <[e-mail]>  Mon, 07 Jun 2010 10:24:51 +0200
+
+indicator-datetime (0.0.2-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+
+ -- Didier Roche <[e-mail]>  Thu, 03 Jun 2010 17:44:45 +0200
+
+indicator-datetime (0.0.2-0ubuntu1~ppa1) lucid; urgency=low
+
+  * New upstream release.
+    * Making label guess and reasonable width starting out.
+
+ -- Ted Gould <[e-mail]>  Thu, 04 Mar 2010 12:04:55 -0600
+
+indicator-datetime (0.0.1-0ubuntu1) lucid; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - add libdbusmenu-gtk-dev build-dep (/!\ not in configure.ac)
+
+ -- Didier Roche <[e-mail]>  Fri, 26 Feb 2010 10:41:22 +0100
+
+indicator-datetime (0.0.1~r2-0ubuntu3) lucid; urgency=low
+
+  * debian/control: Adding libdbusmenu-gtk as a build dep
+
+ -- Ted Gould <[e-mail]>  Thu, 18 Feb 2010 10:47:29 -0600
+
+indicator-datetime (0.0.1~r2-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    - fix build-dep
+
+ -- Didier Roche <[e-mail]>  Thu, 11 Feb 2010 20:27:22 +0100
+
+indicator-datetime (0.0.1~r2-0ubuntu1) lucid; urgency=low
+
+  * new upstream version
+
+ -- Didier Roche <[e-mail]>  Wed, 10 Feb 2010 12:10:48 +0100
+
+indicator-datetime (0.0.1~r1-0ubuntu1) lucid; urgency=low
+
+  * Initial packaging
+
+ -- Didier Roche <[e-mail]>  Wed, 27 Jan 2010 12:13:00 +0100
+>>>>>>> MERGE-SOURCE

=== 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 @@
+<<<<<<< TREE
 Source: indicator-datetime
 Section: misc
 Priority: optional
@@ -25,3 +26,37 @@
 Description: A very, very simple clock
  A simple clock appearing in the indicator bar
 
+=======
+Source: indicator-datetime
+Section: misc
+Priority: optional
+Maintainer: Ubuntu Desktop Team <[e-mail]>
+Build-Depends: cdbs, 
+               debhelper (>= 5), 
+               intltool (>= 0.35.0), 
+               libindicator-dev (>= 0.3.14),
+               libdbusmenu-glib-dev (>= 0.3.90),
+               libdbusmenu-gtk-dev (>= 0.3.90),
+               libglib2.0-dev (>= 2.25.0),
+               libido-0.1-dev (>= 0.1.10),
+               libgeoclue-dev (>= 0.12.0),
+               liboobs-1-dev (>= 2.31.0),
+               libecal1.2-dev (>= 2.30),
+               libical-dev (>= 0.44),
+               libgtk2.0-dev (>= 2.22),
+               libcairo2-dev (>= 1.10),
+               libedataserver1.2-dev (>= 2.30)
+Standards-Version: 3.9.1
+Homepage: https://launchpad.net/indicator-datetime
+Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu
+
+Package: indicator-datetime
+Architecture: any
+Depends: ${shlibs:Depends}, 
+         ${misc:Depends},
+         geoclue-ubuntu-geoip | geoclue-provider
+Recommends: indicator-applet | indicator-renderer
+Description: A very, very simple clock
+ A simple clock appearing in the indicator bar
+
+>>>>>>> MERGE-SOURCE

=== 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 @@
 	g_debug("Created Geoclue client at: %s", path);
 
 	geo_master = client;
+<<<<<<< TREE
 
 	g_return_if_fail(geo_master != NULL);
 
+=======
+
+	if (geo_master != NULL) {
+		g_warning(_("Unable to get a GeoClue client!  Geolocation based timezone support will not be available."));
+		return;
+	}
+
+>>>>>>> MERGE-SOURCE
 	g_object_ref(G_OBJECT(geo_master));
 
 	/* New client, make sure we don't have an address hanging on */