From 2839a0288cf121e9de202a7938ac52b0238f9f12 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Fri, 28 Oct 2011 11:27:13 -0400 Subject: releasing version 0.3.1-0ubuntu2 --- debian/changelog | 7 +++++++ debian/patches/lp_802384.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 26 insertions(+) create mode 100644 debian/patches/lp_802384.patch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 5013f67..767d2ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.3.1-0ubuntu2) precise; urgency=low + + * debian/patches/lp_802384.patch + - Fixed a NULL check which prevented querying geoclue (LP: #802384) + + -- Ken VanDine Fri, 28 Oct 2011 11:20:55 -0400 + indicator-datetime (0.3.1-0ubuntu1) oneiric-proposed; urgency=low * New upstream release. diff --git a/debian/patches/lp_802384.patch b/debian/patches/lp_802384.patch new file mode 100644 index 0000000..2c30c9f --- /dev/null +++ b/debian/patches/lp_802384.patch @@ -0,0 +1,18 @@ +=== modified file 'src/datetime-service.c' +--- a/src/datetime-service.c 2011-10-13 04:30:40 +0000 ++++ b/src/datetime-service.c 2011-10-23 21:54:15 +0000 +@@ -1404,7 +1404,12 @@ + + geo_master = client; + +- if (geo_master != NULL) { ++ if (error != NULL) { ++ g_warning("Unable to get a GeoClue client! '%s' Geolocation based timezone support will not be available.", error->message); ++ return; ++ } ++ ++ if (geo_master == NULL) { + g_warning(_("Unable to get a GeoClue client! Geolocation based timezone support will not be available.")); + return; + } + diff --git a/debian/patches/series b/debian/patches/series index 9ebd065..d70dbda 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ lp_844741.patch +lp_802384.patch -- cgit v1.2.3