From e86b713958fdafa8c47bc2d83a12a25b66fcf40b Mon Sep 17 00:00:00 2001 From: Ken VanDine Date: Wed, 5 Oct 2011 15:04:17 -0400 Subject: releasing version 0.3.0-0ubuntu2 --- debian/patches/lp_844741.patch | 12 ++++++++++++ debian/patches/series | 1 + 2 files changed, 13 insertions(+) create mode 100644 debian/patches/lp_844741.patch create mode 100644 debian/patches/series (limited to 'debian/patches') diff --git a/debian/patches/lp_844741.patch b/debian/patches/lp_844741.patch new file mode 100644 index 0000000..459779d --- /dev/null +++ b/debian/patches/lp_844741.patch @@ -0,0 +1,12 @@ +=== modified file 'src/timezone-completion.c' +--- a/src/timezone-completion.c 2011-09-06 12:47:37 +0000 ++++ b/src/timezone-completion.c 2011-10-05 15:47:06 +0000 +@@ -355,7 +355,6 @@ + gchar * locale = get_locale (); + gchar * url = g_strdup_printf (GEONAME_URL, escaped, version, locale); + g_free (locale); +- g_free (version); + g_free (escaped); + + GFile * file = g_file_new_for_uri (url); + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9ebd065 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +lp_844741.patch -- cgit v1.2.3 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/patches') 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 From 91fead5245d4c8cecac084f1e4d2837a49b831c3 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 13 Jan 2012 00:03:36 +0100 Subject: * Rebuild for the new e-d-s libraries. * debian/patches/gtk_box_api.patch: port gtk_hbox_new() to gtk_box_new() if building for GTK3, no change if building against GTK2. --- debian/changelog | 8 ++++++++ debian/patches/gtk_box_api.patch | 41 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 50 insertions(+) create mode 100644 debian/patches/gtk_box_api.patch (limited to 'debian/patches') diff --git a/debian/changelog b/debian/changelog index 767d2ec..4c7d39b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +indicator-datetime (0.3.1-0ubuntu3) UNRELEASED; urgency=low + + * Rebuild for the new e-d-s libraries. + * debian/patches/gtk_box_api.patch: port gtk_hbox_new() to gtk_box_new() if + building for GTK3, no change if building against GTK2. + + -- Mathieu Trudel-Lapierre Thu, 12 Jan 2012 23:23:36 +0100 + indicator-datetime (0.3.1-0ubuntu2) precise; urgency=low * debian/patches/lp_802384.patch diff --git a/debian/patches/gtk_box_api.patch b/debian/patches/gtk_box_api.patch new file mode 100644 index 0000000..0dd28f0 --- /dev/null +++ b/debian/patches/gtk_box_api.patch @@ -0,0 +1,41 @@ +From: Mathieu Trudel-Lapierre +Subject: Port to the new gtk_box_new() instead of gtk_hbox_new(). + +Index: indicator-datetime/src/indicator-datetime.c +=================================================================== +--- indicator-datetime.orig/src/indicator-datetime.c 2012-01-12 23:59:50.815675283 +0100 ++++ indicator-datetime/src/indicator-datetime.c 2012-01-13 00:02:24.083668449 +0100 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + /* Indicator Stuff */ + #include +@@ -1261,7 +1262,12 @@ + + mi_data->gmi = gtk_menu_item_new(); + ++#if GTK_CHECK_VERSION(3, 2, 0) ++ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); ++ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); ++#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 4); ++#endif + + /* Icon, probably someone's face or avatar on an IM */ + mi_data->icon = gtk_image_new(); +@@ -1472,7 +1478,12 @@ + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(mi_data->gmi), + dbusmenu_menuitem_property_get_bool(newitem, TIMEZONE_MENUITEM_PROP_RADIO)); + ++#if GTK_CHECK_VERSION(3, 2, 0) ++ GtkWidget * hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 4); ++ gtk_box_set_homogeneous (GTK_BOX(hbox), FALSE); ++#else + GtkWidget * hbox = gtk_hbox_new(FALSE, 4); ++#endif + + /* Label, probably a username, chat room or mailbox name */ + mi_data->label = gtk_label_new(""); diff --git a/debian/patches/series b/debian/patches/series index d70dbda..aa1e0b7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ lp_844741.patch lp_802384.patch +gtk_box_api.patch -- cgit v1.2.3 From 6104c44c16a903741ddc34851fb948da0f21ec06 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 23 Jan 2012 13:07:14 +0100 Subject: Add disable_Werror.patch: Disable -Werror, causes build failures due to deprecated symbols. --- debian/changelog | 5 +++++ debian/patches/disable_Werror.patch | 31 +++++++++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 37 insertions(+) create mode 100644 debian/patches/disable_Werror.patch (limited to 'debian/patches') diff --git a/debian/changelog b/debian/changelog index 55a29ee..b69252a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,12 @@ indicator-datetime (0.3.1-0ubuntu4) UNRELEASED; urgency=low + [ Andreas Moog ] * Migrate from libpolkit-gtk-1-dev to libpolkit-gobject-1-dev. + [ Martin Pitt ] + * Add disable_Werror.patch: Disable -Werror, causes build failures due to + deprecated symbols. + -- Andreas Moog Sat, 24 Dec 2011 21:07:57 +0100 indicator-datetime (0.3.1-0ubuntu3) precise; urgency=low diff --git a/debian/patches/disable_Werror.patch b/debian/patches/disable_Werror.patch new file mode 100644 index 0000000..fc267ca --- /dev/null +++ b/debian/patches/disable_Werror.patch @@ -0,0 +1,31 @@ +Description: Disable -Werror, causes build failures due to deprecated symbols. +Author: Martin Pitt + +Index: indicator-datetime/src/Makefile.am +=================================================================== +--- indicator-datetime.orig/src/Makefile.am 2011-10-06 06:50:07.814203000 +0200 ++++ indicator-datetime/src/Makefile.am 2012-01-23 13:04:31.541545936 +0100 +@@ -15,7 +15,6 @@ + settings-shared.h + indicator_datetime_service_CFLAGS = \ + -Wall \ +- -Werror \ + $(SERVICE_CFLAGS) \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" +@@ -33,7 +32,6 @@ + indicator-datetime.c + libdatetime_la_CFLAGS = \ + $(INDICATOR_CFLAGS) \ +- -Wall -Werror \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ + -DG_LOG_DOMAIN=\"Indicator-Datetime\" + libdatetime_la_LIBADD = \ +@@ -53,7 +51,6 @@ + settings-shared.h + libindicator_datetime_la_CFLAGS = \ + -Wall \ +- -Werror \ + -I$(top_srcdir)/libmap \ + $(PREF_CFLAGS) \ + -DTIMEZONE_FILE="\"/etc/timezone\"" \ diff --git a/debian/patches/series b/debian/patches/series index aa1e0b7..ab309a3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +disable_Werror.patch lp_844741.patch lp_802384.patch gtk_box_api.patch -- cgit v1.2.3