Merging in Ubuntu Desktop

7 files changed, 155 insertions, 4 deletions

diff --git a/debian/changelog b/debian/changelog
index 3a5139d..f8aab12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,59 @@
-indicator-datetime (0.3.1-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-datetime (0.3.1-0ubuntu5) precise; urgency=low
+
+  * no change rebuild for libindicator7
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 25 Jan 2012 09:54:53 -0500
+
+indicator-datetime (0.3.1-0ubuntu4) precise; 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.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 23 Jan 2012 13:09:08 +0100
+
+indicator-datetime (0.3.1-0ubuntu3) precise; 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 <mathieu-tl@ubuntu.com>  Fri, 13 Jan 2012 00:03:40 +0100
+
+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.
     * Drop an unused icon (LP: #746176)
     * Fix showing a timezone that we're currently set to (LP: #833337)
     * Remove check for libunique as it's unused
-  * debian/control: Drop libunique requirements
+  * debian/control: Drop libunique requirements, it was unused
 
  -- Ted Gould <ted@ubuntu.com>  Thu, 13 Oct 2011 13:40:21 -0500
 
-indicator-datetime (0.3.0-0ubuntu1~ppa1) oneiric; urgency=low
+indicator-datetime (0.3.0-0ubuntu3) oneiric; urgency=low
+
+  * Reupload to oneiric final, the fix is safe and important enough.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 06 Oct 2011 06:50:30 +0200
+
+indicator-datetime (0.3.0-0ubuntu2) oneiric-proposed; urgency=low
+
+  * debian/patches/lp_844741.patch
+    - gnome-control-center crashed with SIGABRT in raise() (LP: #844741)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 05 Oct 2011 11:59:21 -0400
+
+indicator-datetime (0.3.0-0ubuntu1) oneiric; urgency=low
 
   [ Ken VanDine ]
   * debian/control
diff --git a/debian/control b/debian/control
index a53c10a..3167f9e 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends: cdbs,
                libgtk-3-dev (>= 3.1.4),
                libcairo2-dev (>= 1.10),
                libjson-glib-dev,
-               libpolkit-gtk-1-dev,
+               libpolkit-gobject-1-dev,
                libedataserver1.2-dev (>= 2.30),
                libedataserverui-3.0-dev,
                libgconf2-dev (>= 2.31),
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 <martin.pitt@ubuntu.com>
+
+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/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 <mathieu.trudel-lapierre@canonical.com>
+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 <glib-object.h>
+ #include <glib/gi18n-lib.h>
+ #include <gio/gio.h>
++#include <gtk/gtk.h>
+ 
+ /* Indicator Stuff */
+ #include <libindicator/indicator.h>
+@@ -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/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/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..ab309a3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+disable_Werror.patch
+lp_844741.patch
+lp_802384.patch
+gtk_box_api.patch