From 4a2c7a22fa0d6c46327cd9be18ebc64057692769 Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 22 Jun 2011 12:09:57 -0400 Subject: releasing version 0.2.90-0ubuntu1 --- debian/changelog | 16 ++++++++++++++-- debian/control | 23 +++++++++++++++++++---- debian/indicator-datetime-gtk2.install | 1 + debian/indicator-datetime.install | 1 + debian/rules | 25 +++++++++++++++++-------- 5 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 debian/indicator-datetime-gtk2.install create mode 100644 debian/indicator-datetime.install diff --git a/debian/changelog b/debian/changelog index c949921..c1c6d23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low +indicator-datetime (0.2.90-0ubuntu1) oneiric; urgency=low + [ Ted Gould ] * New upstream release. - Set minimum width for appointments to prevent continuous resizing when the calendar is hiden and ensure there is enough of the @@ -10,7 +11,18 @@ indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low as merged upstream. * debian/control: Switching dep to libedataserverui-3.0-dev - -- Ted Gould Tue, 21 Jun 2011 14:29:24 -0500 + [ Ken VanDine ] + * debian/control + - Bumped standards version to 3.9.2 + - Add new binary for indicator-datetime-gtk2 + - Make indicator-datetime recommend indicator-datetime-gtk2 (until unity + can load gtk3 indicators) + - indicator-datetime-gtk2 replaces indicator-datetime << 0.2.90 + - Added build depends for libdbusmenu-gtk3-dev and libindicator3-dev + * debian/rules + - build for both gtk2 and gtk3 + + -- Ken VanDine Wed, 22 Jun 2011 11:46:55 -0400 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low diff --git a/debian/control b/debian/control index 47fc9c6..83819e0 100644 --- a/debian/control +++ b/debian/control @@ -5,9 +5,11 @@ Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), intltool (>= 0.35.0), - libindicator-dev (>= 0.3.14), + libindicator-dev (>= 0.3.19), + libindicator3-dev (>= 0.3.19), libdbusmenu-glib-dev (>= 0.3.90), - libdbusmenu-gtk-dev (>= 0.3.90), + libdbusmenu-gtk-dev (>= 0.3.94), + libdbusmenu-gtk3-dev (>= 0.3.94), libglib2.0-dev (>= 2.25.0), libido-0.1-dev (>= 0.2.2), libido3-0.1-dev (>= 0.2.90), @@ -16,6 +18,7 @@ Build-Depends: cdbs, libecal1.2-dev (>= 2.30), libical-dev (>= 0.44), libgtk2.0-dev (>= 2.22), + libgtk-3-dev (>= 3.1.4), libcairo2-dev (>= 1.10), libjson-glib-dev, libunique-dev, @@ -24,7 +27,7 @@ Build-Depends: cdbs, libedataserverui-3.0-dev, libgconf2-dev (>= 2.31), dh-autoreconf -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: https://launchpad.net/indicator-datetime Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-desktop/indicator-datetime/ubuntu @@ -33,7 +36,19 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, geoclue-ubuntu-geoip | geoclue-provider +Recommends: indicator-applet | indicator-renderer, + indicator-datetime-gtk2 +Description: Simple clock + A simple clock appearing in the indicator bar + +Package: indicator-datetime-gtk2 +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + indicator-datetime (= ${binary:Version}), + geoclue-ubuntu-geoip | geoclue-provider +Replaces: indicator-datetime (<< 0.2.90) Recommends: indicator-applet | indicator-renderer -Description: A very, very simple clock +Description: Simple clock A simple clock appearing in the indicator bar diff --git a/debian/indicator-datetime-gtk2.install b/debian/indicator-datetime-gtk2.install new file mode 100644 index 0000000..8d1fc9f --- /dev/null +++ b/debian/indicator-datetime-gtk2.install @@ -0,0 +1 @@ +debian/tmp/gtk2/usr/lib/indicators /usr/lib/ diff --git a/debian/indicator-datetime.install b/debian/indicator-datetime.install new file mode 100644 index 0000000..19a45de --- /dev/null +++ b/debian/indicator-datetime.install @@ -0,0 +1 @@ +debian/tmp/gtk3/usr / diff --git a/debian/rules b/debian/rules index baf32ef..7950ed1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,14 +1,23 @@ #!/usr/bin/make -f +DEB_BUILDDIR = build +DEB_MAKE_FLAVORS = gtk2 gtk3 + include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/rules/simple-patchsys.mk -include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/gnome.mk -include /usr/share/cdbs/1/rules/utils.mk -include /usr/share/cdbs/1/rules/autoreconf.mk -install/indicator-datetime:: - find debian/indicator-datetime/usr/lib -name \*.la -exec rm {} \; - find debian/indicator-datetime/usr/lib -name \*.a -exec rm {} \; +DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@ +DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/ + +DEB_CONFIGURE_FLAGS_gtk2 = --with-gtk=2 +DEB_CONFIGURE_FLAGS_gtk3 = --with-gtk=3 +DEB_CONFIGURE_EXTRA_FLAGS = --disable-static + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + +debian/stamp-autotools/gtk2: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk2) +debian/stamp-autotools/gtk3: cdbs_configure_flags += $(DEB_CONFIGURE_FLAGS_gtk3) -common-binary-post-install-arch:: list-missing +common-install-arch:: + find debian/tmp -name \*.la -delete + find debian/tmp -name \*.a -delete -- cgit v1.2.3 From 5e9dc5469428fe05f7e70948980a0e79d193b857 Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 28 Jun 2011 15:56:27 +0100 Subject: * debian/control: - Drop -gtk2 recommends for the gtk3 indicator * debian/rules: - Use dh-autoreconf * debian/patches/fix-timezones.patch: - Add patch to handle g-s-d DBus API change for timezones and to be more robust about querying what the current timezone is --- debian/changelog | 12 +++ debian/control | 3 +- debian/patches/fix-timezones.patch | 168 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 1 + 5 files changed, 183 insertions(+), 2 deletions(-) create mode 100644 debian/patches/fix-timezones.patch create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index c1c6d23..07cd704 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +indicator-datetime (0.2.90-0ubuntu2) oneiric; urgency=low + + * debian/control: + - Drop -gtk2 recommends for the gtk3 indicator + * debian/rules: + - Use dh-autoreconf + * debian/patches/fix-timezones.patch: + - Add patch to handle g-s-d DBus API change for timezones and to + be more robust about querying what the current timezone is + + -- Michael Terry Tue, 28 Jun 2011 15:42:39 +0100 + indicator-datetime (0.2.90-0ubuntu1) oneiric; urgency=low [ Ted Gould ] diff --git a/debian/control b/debian/control index 83819e0..66d7e0a 100644 --- a/debian/control +++ b/debian/control @@ -36,8 +36,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, geoclue-ubuntu-geoip | geoclue-provider -Recommends: indicator-applet | indicator-renderer, - indicator-datetime-gtk2 +Recommends: indicator-applet | indicator-renderer Description: Simple clock A simple clock appearing in the indicator bar diff --git a/debian/patches/fix-timezones.patch b/debian/patches/fix-timezones.patch new file mode 100644 index 0000000..6e32d61 --- /dev/null +++ b/debian/patches/fix-timezones.patch @@ -0,0 +1,168 @@ +Index: indicator-datetime.ubu/src/Makefile.am +=================================================================== +--- indicator-datetime.ubu.orig/src/Makefile.am 2011-06-28 15:42:04.085059003 +0100 ++++ indicator-datetime.ubu/src/Makefile.am 2011-06-28 15:42:19.553059167 +0100 +@@ -34,6 +34,7 @@ + libdatetime_la_CFLAGS = \ + $(INDICATOR_CFLAGS) \ + -Wall -Werror \ ++ -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" + libdatetime_la_LIBADD = \ + $(INDICATOR_LIBS) +@@ -55,6 +56,7 @@ + -Werror \ + -I$(top_srcdir)/libmap \ + $(PREF_CFLAGS) \ ++ -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DPKGDATADIR="\"$(pkgdatadir)\"" + indicator_datetime_preferences_LDADD = \ + $(top_builddir)/libmap/libmap.la \ +Index: indicator-datetime.ubu/src/datetime-prefs.c +=================================================================== +--- indicator-datetime.ubu.orig/src/datetime-prefs.c 2011-06-28 15:42:04.129059003 +0100 ++++ indicator-datetime.ubu/src/datetime-prefs.c 2011-06-28 15:42:19.553059167 +0100 +@@ -223,10 +223,8 @@ + if (location == NULL) + return; + +- gchar * file = g_build_filename ("/usr/share/zoneinfo", location->zone, NULL); +- g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", file), ++ g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", location->zone), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, dbus_set_answered, "timezone"); +- g_free (file); + + sync_entry (location->zone); + } +Index: indicator-datetime.ubu/src/datetime-service.c +=================================================================== +--- indicator-datetime.ubu.orig/src/datetime-service.c 2011-06-28 15:42:04.249059005 +0100 ++++ indicator-datetime.ubu/src/datetime-service.c 2011-06-28 15:42:19.561059167 +0100 +@@ -221,29 +221,15 @@ + current_timezone = NULL; + } + +- GError * error = NULL; +- gchar * tempzone = NULL; +- if (!g_file_get_contents(TIMEZONE_FILE, &tempzone, NULL, &error)) { +- g_warning("Unable to read timezone file '" TIMEZONE_FILE "': %s", error->message); +- g_error_free(error); ++ current_timezone = read_timezone (); ++ if (current_timezone == NULL) { + return; + } + +- /* This shouldn't happen, so let's make it a big boom! */ +- g_return_if_fail(tempzone != NULL); +- +- /* Note: this really makes sense as strstrip works in place +- so we end up with something a little odd without the dup +- so we have the dup to make sure everything is as expected +- for everyone else. */ +- current_timezone = g_strdup(g_strstrip(tempzone)); +- g_free(tempzone); +- + g_debug("System timezone is: %s", current_timezone); + + check_timezone_sync(); + +- if (error != NULL) g_error_free(error); + return; + } + +@@ -276,10 +262,8 @@ + return; + } + +- gchar * file = g_build_filename ("/usr/share/zoneinfo", (char *)zone, NULL); +- g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", file), ++ g_dbus_proxy_call (proxy, "SetTimezone", g_variant_new ("(s)", zone), + G_DBUS_CALL_FLAGS_NONE, -1, NULL, quick_set_tz_cb, NULL); +- g_free (file); + g_free (zone); + g_object_unref (proxy); + } +Index: indicator-datetime.ubu/src/indicator-datetime.c +=================================================================== +--- indicator-datetime.ubu.orig/src/indicator-datetime.c 2011-06-28 15:42:04.293059005 +0100 ++++ indicator-datetime.ubu/src/indicator-datetime.c 2011-06-28 15:42:19.565059167 +0100 +@@ -761,11 +761,18 @@ + GTimeZone * tz, const gchar * format, + GDateTime ** datetime) + { ++ gboolean unref_tz = FALSE; ++ if (tz == NULL) { ++ gchar * zone = read_timezone (); ++ if (zone == NULL) ++ return; ++ tz = g_time_zone_new(zone); ++ unref_tz = TRUE; ++ g_free (zone); ++ } ++ + GDateTime * datetime_now; +- if (tz == NULL) +- datetime_now = g_date_time_new_now_local(); +- else +- datetime_now = g_date_time_new_now(tz); ++ datetime_now = g_date_time_new_now(tz); + + gchar * timestr; + if (format == NULL) { +@@ -793,6 +800,9 @@ + else + g_date_time_unref(datetime_now); + ++ if (unref_tz) ++ g_time_zone_unref(tz); ++ + return; + } + +Index: indicator-datetime.ubu/src/utils.c +=================================================================== +--- indicator-datetime.ubu.orig/src/utils.c 2011-06-28 15:42:04.169059004 +0100 ++++ indicator-datetime.ubu/src/utils.c 2011-06-28 15:42:19.565059167 +0100 +@@ -117,6 +117,30 @@ + return rv; + } + ++gchar * ++read_timezone () ++{ ++ GError * error = NULL; ++ gchar * tempzone = NULL; ++ if (!g_file_get_contents(TIMEZONE_FILE, &tempzone, NULL, &error)) { ++ g_warning("Unable to read timezone file '" TIMEZONE_FILE "': %s", error->message); ++ g_error_free(error); ++ return NULL; ++ } ++ ++ /* This shouldn't happen, so let's make it a big boom! */ ++ g_return_val_if_fail(tempzone != NULL, NULL); ++ ++ /* Note: this really makes sense as strstrip works in place ++ so we end up with something a little odd without the dup ++ so we have the dup to make sure everything is as expected ++ for everyone else. */ ++ gchar * rv = g_strdup(g_strstrip(tempzone)); ++ g_free(tempzone); ++ ++ return rv; ++} ++ + /* Translate msg according to the locale specified by LC_TIME */ + static char * + T_(const char *msg) +Index: indicator-datetime.ubu/src/utils.h +=================================================================== +--- indicator-datetime.ubu.orig/src/utils.h 2011-06-28 15:42:04.209059004 +0100 ++++ indicator-datetime.ubu/src/utils.h 2011-06-28 15:42:19.569059167 +0100 +@@ -30,6 +30,7 @@ + gboolean is_locale_12h (void); + void split_settings_location (const gchar * location, gchar ** zone, gchar ** name); + gchar * get_current_zone_name (const gchar * location); ++gchar * read_timezone (); + gchar * generate_format_string_full (gboolean show_day, gboolean show_date); + gchar * generate_format_string_at_time (GDateTime * time); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..a593ee2 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-timezones.patch diff --git a/debian/rules b/debian/rules index 7950ed1..dfd669b 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ DEB_BUILDDIR = build DEB_MAKE_FLAVORS = gtk2 gtk3 +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -- cgit v1.2.3 From 33d9b7f27eed027e1986ba4197d14434bc6ce37b Mon Sep 17 00:00:00 2001 From: Michael Terry Date: Tue, 28 Jun 2011 17:57:03 +0100 Subject: * No change rebuild to fix badly packaged diff.gz from last time * debian/rules, debian/control: - Arg, this wasn't source format 3.0, so add quilt so that the patch applies. --- debian/changelog | 14 ++++++++++++++ debian/control | 1 + debian/rules | 1 + 3 files changed, 16 insertions(+) diff --git a/debian/changelog b/debian/changelog index 07cd704..741fa90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +indicator-datetime (0.2.90-0ubuntu4) oneiric; urgency=low + + * No change rebuild to fix badly packaged diff.gz from last time + + -- Michael Terry Tue, 28 Jun 2011 17:55:25 +0100 + +indicator-datetime (0.2.90-0ubuntu3) oneiric; urgency=low + + * debian/rules, debian/control: + - Arg, this wasn't source format 3.0, so add quilt so that the patch + applies. + + -- Michael Terry Tue, 28 Jun 2011 17:05:59 +0100 + indicator-datetime (0.2.90-0ubuntu2) oneiric; urgency=low * debian/control: diff --git a/debian/control b/debian/control index 66d7e0a..b830e91 100644 --- a/debian/control +++ b/debian/control @@ -4,6 +4,7 @@ Priority: optional Maintainer: Ubuntu Desktop Team Build-Depends: cdbs, debhelper (>= 5), + quilt, intltool (>= 0.35.0), libindicator-dev (>= 0.3.19), libindicator3-dev (>= 0.3.19), diff --git a/debian/rules b/debian/rules index dfd669b..2ad101c 100755 --- a/debian/rules +++ b/debian/rules @@ -3,6 +3,7 @@ DEB_BUILDDIR = build DEB_MAKE_FLAVORS = gtk2 gtk3 +include /usr/share/cdbs/1/rules/patchsys-quilt.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk -- cgit v1.2.3