diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-08 22:20:23 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-08 22:20:23 -0600 |
| commit | a2e3af0af0cb242500c84ff76df39b97e255d283 (patch) | |
| tree | a1e4eabe18a4d3b2faa0a011995705cc6e53af19 | |
| parent | cd61d9f8a6fbb1fb245c8ddc1cc21208305b4b6d (diff) | |
| parent | ab79902d9ea172709358b761bc4675da2f4bd6d3 (diff) | |
| download | ayatana-indicator-datetime-a2e3af0af0cb242500c84ff76df39b97e255d283.tar.gz ayatana-indicator-datetime-a2e3af0af0cb242500c84ff76df39b97e255d283.tar.bz2 ayatana-indicator-datetime-a2e3af0af0cb242500c84ff76df39b97e255d283.zip | |
Merging in U. Desktop
| -rw-r--r-- | debian/changelog | 25 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/source/format | 1 | ||||
| -rw-r--r-- | src/datetime-service.c | 3 |
4 files changed, 34 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index c5410c5..13d34cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,28 @@ +indicator-datetime (0.1.92-0ubuntu4) natty; urgency=low + + * debian/source/format + - Source format v1 instead of v3 + + -- Ken VanDine <ken.vandine@canonical.com> 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 <ken.vandine@canonical.com> 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 <ken.vandine@canonical.com> Tue, 08 Feb 2011 11:02:31 -0500 + indicator-datetime (0.1.92-0ubuntu1) natty; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 49a3ca8..b02380d 100644 --- a/debian/control +++ b/debian/control @@ -12,14 +12,16 @@ Build-Depends: cdbs, libido-0.1-dev (>= 0.1.10), libgeoclue-dev (>= 0.12.0), liboobs-1-dev (>= 2.31.0) -Standards-Version: 3.8.4 +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} -Recommends: indicator-applet | indicator-renderer, geoclue-ubuntu-geoip + ${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 diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/src/datetime-service.c b/src/datetime-service.c index 9f795d1..7d35a38 100644 --- a/src/datetime-service.c +++ b/src/datetime-service.c @@ -512,6 +512,9 @@ geo_create_client (GeoclueMaster * master, GeoclueMasterClient * client, gchar * g_debug("Created Geoclue client at: %s", path); geo_master = client; + + g_return_if_fail(geo_master != NULL); + g_object_ref(G_OBJECT(geo_master)); /* New client, make sure we don't have an address hanging on */ |