Adding debian version 0.5.8-1. debian/0.5.8-1
authorDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:52:16 +0000 (13:52 +0200)
committerDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:52:16 +0000 (13:52 +0200)
debian/changelog
debian/patches/10_fix_menu.patch [deleted file]
debian/patches/series

index 1374cb0..cbb7be2 100644 (file)
@@ -1,3 +1,14 @@
+lxpanel (0.5.8-1) unstable; urgency=low
+
+  * Merging upstream version 0.5.8:
+    - fix typo to make code build with old gtk
+    - fixed compiler warning
+    - fixed error in tooltipS function call
+    - Fix usage of GtkRequisition
+  * Drop 10_fix_menu.patch: included in upstream.
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Sat, 30 Jul 2011 20:35:23 +0800
+
 lxpanel (0.5.7-1) unstable; urgency=low
 
   * Use debhelper 8
diff --git a/debian/patches/10_fix_menu.patch b/debian/patches/10_fix_menu.patch
deleted file mode 100644 (file)
index 01aad3e..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 200121f93d7c6ac9aadb53c58f45906ecd1e3b7a
-Author: Julien Lavergne <julien.lavergne@gmail.com>
-Date:   Sun Jul 24 15:43:24 2011 +0200
-
-    Fix usage of GtkRequisition
-
-diff --git a/src/plugins/menu.c b/src/plugins/menu.c
-index 59a8dad..6d0ad9c 100644
---- a/src/plugins/menu.c
-+++ b/src/plugins/menu.c
-@@ -142,10 +142,10 @@ menu_pos(GtkMenu *menu, gint *x, gint *y, gboolean *push_in, GtkWidget *widget)
-     gdk_window_get_origin(widget->window, &ox, &oy);
- #endif
- #if GTK_CHECK_VERSION(2,20,0)
--    GtkRequisition *requisition;
--    gtk_widget_get_requisition(GTK_WIDGET(menu),requisition);
--    w = requisition->width;
--    h = requisition->height;
-+    GtkRequisition requisition;
-+    gtk_widget_get_requisition(GTK_WIDGET(menu), &requisition);
-+    w = requisition.width;
-+    h = requisition.height;
- #else
-     w = GTK_WIDGET(menu)->requisition.width;
index 99cd6de..6617396 100644 (file)
@@ -1,4 +1,3 @@
 missing_glades.patch
 default-config.patch
 configure_desktop_number.patch
-10_fix_menu.patch