* New upstream release.

  - Set minimum width for appointments to prevent continuous resizing 
    when the calendar is hiden and ensure there is enough of the 
    event description visible (LP: #762976)
  - ellipsize long appointment descriptions (LP: #750671)
  - GTK3 build
* Dropping debian/patches/lp_762976.patch and debian/patches/lp_750671.patch
  as merged upstream.
* debian/control: Switching dep to libedataserverui-3.0-dev
* Upstream Merge
  * Ellipsize calendar entries that are too long (LP: #750671)

4 files changed, 24 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index bd936c7..c949921 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+indicator-datetime (0.2.90-0ubuntu1~ppa1) oneiric; urgency=low
+
+  * New upstream release.
+    - Set minimum width for appointments to prevent continuous resizing 
+      when the calendar is hiden and ensure there is enough of the 
+      event description visible (LP: #762976)
+    - ellipsize long appointment descriptions (LP: #750671)
+    - GTK3 build
+  * Dropping debian/patches/lp_762976.patch and debian/patches/lp_750671.patch
+    as merged upstream.
+  * debian/control: Switching dep to libedataserverui-3.0-dev
+
+ -- Ted Gould <ted@ubuntu.com>  Tue, 21 Jun 2011 14:29:24 -0500
+
 indicator-datetime (0.2.3-0ubuntu3) natty; urgency=low
 
   * debian/patches/lp_762976.patch
@@ -14,6 +28,13 @@ indicator-datetime (0.2.3-0ubuntu2) natty; urgency=low
 
  -- Ken VanDine <ken.vandine@canonical.com>  Fri, 15 Apr 2011 10:00:41 -0400
 
+indicator-datetime (0.2.3-0ubuntu2~ppa1) natty; urgency=low
+
+  * Upstream Merge
+    * Ellipsize calendar entries that are too long (LP: #750671)
+
+ -- Ted Gould <ted@ubuntu.com>  Fri, 15 Apr 2011 09:32:43 -0500
+
 indicator-datetime (0.2.3-0ubuntu1) natty; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index ee66b3a..47fc9c6 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Build-Depends: cdbs,
                libdbusmenu-gtk-dev (>= 0.3.90),
                libglib2.0-dev (>= 2.25.0),
                libido-0.1-dev (>= 0.2.2),
+               libido3-0.1-dev (>= 0.2.90),
+               libunique-3.0-dev,
                libgeoclue-dev (>= 0.12.0),
                libecal1.2-dev (>= 2.30),
                libical-dev (>= 0.44),
@@ -19,7 +21,7 @@ Build-Depends: cdbs,
                libunique-dev,
                libpolkit-gtk-1-dev,
                libedataserver1.2-dev (>= 2.30),
-               libedataserverui1.2-dev (>= 2.30),
+               libedataserverui-3.0-dev,
                libgconf2-dev (>= 2.31),
                dh-autoreconf
 Standards-Version: 3.9.1
diff --git a/debian/patches/lp_750671.patch b/debian/patches/lp_750671.patch
deleted file mode 100644
index 676f4f1..0000000
--- a/debian/patches/lp_750671.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-=== modified file 'src/indicator-datetime.c'
---- src/indicator-datetime.c	2011-04-13 19:32:18 +0000
-+++ src/indicator-datetime.c	2011-04-15 13:23:28 +0000
-@@ -1285,6 +1285,7 @@
- 	/* Label, probably a username, chat room or mailbox name */
- 	mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPOINTMENT_MENUITEM_PROP_LABEL));
- 	gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5);
-+	gtk_label_set_ellipsize(GTK_LABEL(mi_data->label), PANGO_ELLIPSIZE_END);
- 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0);
- 	gtk_widget_show(mi_data->label);
- 
-
diff --git a/debian/patches/lp_762976.patch b/debian/patches/lp_762976.patch
deleted file mode 100644
index e62280a..0000000
--- a/debian/patches/lp_762976.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-=== modified file 'src/indicator-datetime.c'
---- src/indicator-datetime.c	2011-04-13 19:32:18 +0000
-+++ src/indicator-datetime.c	2011-04-18 09:59:43 +0000
-@@ -1285,6 +1285,13 @@
- 	/* Label, probably a username, chat room or mailbox name */
- 	mi_data->label = gtk_label_new(dbusmenu_menuitem_property_get(newitem, APPOINTMENT_MENUITEM_PROP_LABEL));
- 	gtk_misc_set_alignment(GTK_MISC(mi_data->label), 0.0, 0.5);
-+	
-+	GtkStyle * style = gtk_widget_get_style(GTK_WIDGET(mi_data->label));
-+	PangoContext * context = gtk_widget_get_pango_context(GTK_WIDGET(mi_data->label));
-+	gint length = measure_string(style, context, "GGGGGGGGGGGGGGG"); // 15 char wide string max
-+	gtk_widget_set_size_request(GTK_WIDGET(mi_data->label), length, -1); // Set the min size in pixels
-+	
-+	gtk_label_set_ellipsize(GTK_LABEL(mi_data->label), PANGO_ELLIPSIZE_END);
- 	gtk_box_pack_start(GTK_BOX(hbox), mi_data->label, TRUE, TRUE, 0);
- 	gtk_widget_show(mi_data->label);
- 
-