[Pkg-xfce-commits] r7069 - in goodies/trunk/xfce4-battery-plugin/debian: . patches

[Yves-Alexis Perez]

Author: corsac
Date: 2012-06-30 13:06:23 +0000 (Sat, 30 Jun 2012)
New Revision: 7069

Removed:
   goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch
   goodies/trunk/xfce4-battery-plugin/debian/patches/series
Modified:
   goodies/trunk/xfce4-battery-plugin/debian/changelog
Log:
* debian/patches:
  - 01_dont-reset-label-orientation dropped, included upstream.

Modified: goodies/trunk/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/changelog	2012-06-30 13:06:01 UTC (rev 7068)
+++ goodies/trunk/xfce4-battery-plugin/debian/changelog	2012-06-30 13:06:23 UTC (rev 7069)
@@ -1,6 +1,8 @@
 xfce4-battery-plugin (1.0.5-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches:
+    - 01_dont-reset-label-orientation dropped, included upstream.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 30 Jun 2012 15:05:52 +0200
 

Deleted: goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch	2012-06-30 13:06:01 UTC (rev 7068)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/01_dont-reset-label-orientation.patch	2012-06-30 13:06:23 UTC (rev 7069)
@@ -1,18 +0,0 @@
-commit 7a5c18a7616944c38bd971c6a76dd93ad343ce07
-Author: Landry Breuil <landry at xfce.org>
-Date:   Mon May 28 14:58:44 2012 +0200
-
-    Don't set labels orientation on 4.8 panels (Bug #8961)
-
-diff --git a/panel-plugin/battery.c b/panel-plugin/battery.c
-index 4168f26..49fd16b 100644
---- a/panel-plugin/battery.c
-+++ b/panel-plugin/battery.c
-@@ -800,7 +800,6 @@ battmon_set_orientation (XfcePanelPlugin *plugin, GtkOrientation orientation,
-     xfce_hvbox_set_orientation(XFCE_HVBOX(battmon->actempbox), !orientation);
-     gtk_progress_bar_set_orientation(GTK_PROGRESS_BAR(battmon->battstatus),
-                (orientation == GTK_ORIENTATION_HORIZONTAL ? GTK_PROGRESS_BOTTOM_TO_TOP : GTK_PROGRESS_LEFT_TO_RIGHT));
--    battmon_set_labels_orientation(battmon, orientation);
-     battmon_set_size(plugin, xfce_panel_plugin_get_size (plugin), battmon);
-     update_apm_status( battmon );
-     battmon->timeoutid = g_timeout_add(1 * 1024, (GSourceFunc) update_apm_status, battmon);

Deleted: goodies/trunk/xfce4-battery-plugin/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/patches/series	2012-06-30 13:06:01 UTC (rev 7068)
+++ goodies/trunk/xfce4-battery-plugin/debian/patches/series	2012-06-30 13:06:23 UTC (rev 7069)
@@ -1 +0,0 @@
-01_dont-reset-label-orientation.patch