diff options
author | Ken VanDine <ken.vandine@canonical.com> | 2011-10-28 11:27:13 -0400 |
---|---|---|
committer | Ken VanDine <ken.vandine@canonical.com> | 2011-10-28 11:27:13 -0400 |
commit | 2839a0288cf121e9de202a7938ac52b0238f9f12 (patch) | |
tree | f26609a0f7ce6383eff03a16b8ec9fc9415c6d18 /debian | |
parent | d6920670c7d7f5fc3f4dfa4a169ad4ccdaf328ba (diff) | |
download | ayatana-indicator-datetime-2839a0288cf121e9de202a7938ac52b0238f9f12.tar.gz ayatana-indicator-datetime-2839a0288cf121e9de202a7938ac52b0238f9f12.tar.bz2 ayatana-indicator-datetime-2839a0288cf121e9de202a7938ac52b0238f9f12.zip |
releasing version 0.3.1-0ubuntu2
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 7 | ||||
-rw-r--r-- | debian/patches/lp_802384.patch | 18 | ||||
-rw-r--r-- | debian/patches/series | 1 |
3 files changed, 26 insertions, 0 deletions
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 <ken.vandine@canonical.com> 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 |