=== modified file 'debian/changelog'
--- debian/changelog	2011-03-08 21:16:44 +0000
+++ debian/changelog	2011-05-25 17:39:48 +0000
@@ -1,3 +1,13 @@
+xfce4-indicator-plugin (0.2.0-0ubuntu5) oneiric; urgency=low
+
+  * debian/patches:
+    - 0004-cherry-pick-vertical-panel-fixes.patch: cherry-pick from upstreamt
+      4e55a3d7292bd4f15b1555530f58e559cb99e965
+      2c0cc99c948d1b5e1ff5fb11057a6bb549849a2d
+      Fixes vertical panel issue with indicators (LP: #787977)
+
+ -- Stéphane Graber <stgraber@ubuntu.com>  Wed, 25 May 2011 13:27:24 -0400
+
 xfce4-indicator-plugin (0.2.0-0ubuntu4) natty; urgency=low
 
   * debian/patches:

=== added file 'debian/patches/0004-cherry-pick-vertical-panel-fixes.patch'
--- debian/patches/0004-cherry-pick-vertical-panel-fixes.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0004-cherry-pick-vertical-panel-fixes.patch	2011-05-25 17:43:18 +0000
@@ -0,0 +1,34 @@
+Description: Cherry pick two commits from upstream
+ http://git.xfce.org/panel-plugins/xfce4-indicator-plugin/commit/?id=4e55a3d7292bd4f15b1555530f58e559cb99e965
+ http://git.xfce.org/panel-plugins/xfce4-indicator-plugin/commit/?id=2c0cc99c948d1b5e1ff5fb11057a6bb549849a2d
+
+ Fix Ubuntu bug LP: #787977
+
+Author: Mark Trompell <mark@foresightlinux.org>
+
+=== modified file 'panel-plugin/indicator.c'
+--- a/panel-plugin/indicator.c	2011-03-08 21:16:44 +0000
++++ b/panel-plugin/indicator.c	2011-05-25 17:41:19 +0000
+@@ -244,8 +244,11 @@
+                             GtkOrientation   orientation,
+                             IndicatorPlugin    *indicator)
+ {
+-  /* change the orienation of the box */
+-  //xfce_hvbox_set_orientation (XFCE_HVBOX (indicator->hvbox), orientation);
++    gint sizex=-1, sizey=-1;
++    gtk_menu_bar_set_pack_direction (GTK_MENU_BAR(indicator->menu),
++        orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB );
++    gtk_widget_get_size_request (GTK_WIDGET (plugin), &sizex, &sizey);
++    gtk_widget_set_size_request (GTK_WIDGET (plugin), sizey, sizex);
+ }
+ 
+ 
+
+--- a/po/POTFILES.skip	2011-03-08 21:16:44 +0000
++++ b/po/POTFILES.skip	2011-05-25 17:38:39 +0000
+@@ -2,3 +2,4 @@
+ .pc/0002-set-up-indicators-with-only-one-function-some-set-he.patch/panel-plugin/indicator.c
+ .pc/0003-relay-the-scroll-event-signals-to-the-indicators-use.patch/panel-plugin/indicator.c
+ .pc/xubuntu_exclude-modules.patch/panel-plugin/indicator.c
++.pc/0004-cherry-pick-vertical-panel-fixes.patch/panel-plugin/indicator.c
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-03-08 21:16:44 +0000
+++ debian/patches/series	2011-05-25 17:38:52 +0000
@@ -2,3 +2,4 @@
 0002-set-up-indicators-with-only-one-function-some-set-he.patch
 0003-relay-the-scroll-event-signals-to-the-indicators-use.patch
 xubuntu_exclude-modules.patch
+0004-cherry-pick-vertical-panel-fixes.patch

=== modified file 'panel-plugin/indicator.c'
--- panel-plugin/indicator.c	2011-03-08 21:16:44 +0000
+++ panel-plugin/indicator.c	2011-05-25 17:41:19 +0000
@@ -244,8 +244,11 @@
                             GtkOrientation   orientation,
                             IndicatorPlugin    *indicator)
 {
-  /* change the orienation of the box */
-  //xfce_hvbox_set_orientation (XFCE_HVBOX (indicator->hvbox), orientation);
+    gint sizex=-1, sizey=-1;
+    gtk_menu_bar_set_pack_direction (GTK_MENU_BAR(indicator->menu),
+        orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_PACK_DIRECTION_LTR : GTK_PACK_DIRECTION_TTB );
+    gtk_widget_get_size_request (GTK_WIDGET (plugin), &sizex, &sizey);
+    gtk_widget_set_size_request (GTK_WIDGET (plugin), sizey, sizex);
 }
 
 

=== modified file 'po/POTFILES.skip'
--- po/POTFILES.skip	2011-03-08 21:16:44 +0000
+++ po/POTFILES.skip	2011-05-25 17:38:39 +0000
@@ -2,3 +2,4 @@
 .pc/0002-set-up-indicators-with-only-one-function-some-set-he.patch/panel-plugin/indicator.c
 .pc/0003-relay-the-scroll-event-signals-to-the-indicators-use.patch/panel-plugin/indicator.c
 .pc/xubuntu_exclude-modules.patch/panel-plugin/indicator.c
+.pc/0004-cherry-pick-vertical-panel-fixes.patch/panel-plugin/indicator.c