From 853418a9952d986f1ee2cabf6f2fd2c98cb37a86 Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 11:06:34 +0200 Subject: * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev --- debian/changelog | 7 +++++++ debian/control | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 097ee42..e75d9c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu2) UNRELEASED; urgency=low + + * Rebuild for libindicator ABI change (LP: #637692) + * debian/control: depends on latest libindicator-dev + + -- Didier Roche Wed, 22 Sep 2010 11:05:15 +0200 + indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 9477216..b97d1f4 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), intltool (>= 0.35.0), - libindicator-dev (>= 0.3.0), + libindicator-dev (>= 0.3.14), libdbusmenu-glib-dev (>= 0.1.1), libdbusmenu-gtk-dev (>= 0.1.1), libglib2.0-dev (>= 2.25.0), -- cgit v1.2.3 From 033e07600d4c846192706351d4deacec6bc8bfdd Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 18:21:28 +0200 Subject: releasing version 0.0.6-0ubuntu2 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e75d9c7..df81697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.6-0ubuntu2) UNRELEASED; urgency=low +indicator-datetime (0.0.6-0ubuntu2) libindicator; urgency=low * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev - -- Didier Roche Wed, 22 Sep 2010 11:05:15 +0200 + -- Didier Roche Wed, 22 Sep 2010 18:21:26 +0200 indicator-datetime (0.0.6-0ubuntu1) maverick; urgency=low -- cgit v1.2.3 From 1c8015f0f5c242b4c44680c71eae7a801af9939f Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Wed, 22 Sep 2010 18:26:19 +0200 Subject: releasing version 0.0.6-0ubuntu2 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index df81697..c5467dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -indicator-datetime (0.0.6-0ubuntu2) libindicator; urgency=low +indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev -- cgit v1.2.3 From f37658a9eccd1e0e8a9ad48212d037344b0bfaee Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 30 Sep 2010 16:09:37 +0200 Subject: * Cherry-picked from upstream: - Fix date string format (12/24h) not taken from translation (LP: #579134) --- debian/changelog | 7 +++++++ src/indicator-datetime.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c5467dd..9584cd0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +indicator-datetime (0.0.6-0ubuntu3) UNRELEASED; urgency=low + + * Cherry-picked from upstream: + - Fix date string format (12/24h) not taken from translation (LP: #579134) + + -- Didier Roche Thu, 30 Sep 2010 16:08:19 +0200 + indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low * Rebuild for libindicator ABI change (LP: #637692) diff --git a/src/indicator-datetime.c b/src/indicator-datetime.c index cef2b00..acdc340 100644 --- a/src/indicator-datetime.c +++ b/src/indicator-datetime.c @@ -220,14 +220,14 @@ indicator_datetime_init (IndicatorDatetime *self) self->priv->idle_measure = 0; self->priv->max_width = 0; - self->priv->time_string = g_strdup(DEFAULT_TIME_FORMAT); - self->priv->time_mode = SETTINGS_TIME_LOCALE; self->priv->show_seconds = FALSE; self->priv->show_date = FALSE; self->priv->show_day = FALSE; self->priv->custom_string = g_strdup(DEFAULT_TIME_FORMAT); + self->priv->time_string = generate_format_string(self); + self->priv->service_proxy = NULL; self->priv->sm = NULL; -- cgit v1.2.3 From 974563dd39779e15266247310a65a24e96eeee6d Mon Sep 17 00:00:00 2001 From: Didier Roche Date: Thu, 30 Sep 2010 16:09:42 +0200 Subject: releasing version 0.0.6-0ubuntu3 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9584cd0..15ee615 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -indicator-datetime (0.0.6-0ubuntu3) UNRELEASED; urgency=low +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 Thu, 30 Sep 2010 16:08:19 +0200 + -- Didier Roche Thu, 30 Sep 2010 16:09:41 +0200 indicator-datetime (0.0.6-0ubuntu2) maverick; urgency=low -- cgit v1.2.3