Adding debian version 0.5.6-1. debian-squeeze debian/0.5.6-1
authorDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:50:15 +0000 (13:50 +0200)
committerDaniel Baumann <daniel@debian.org>
Fri, 20 Apr 2012 11:50:15 +0000 (13:50 +0200)
debian/changelog
debian/control
debian/patches/g_locale_to_utf8.patch [deleted file]
debian/patches/kbled.patch [deleted file]
debian/patches/libtool-fix.patch [deleted file]
debian/patches/panel_draw_label_text.patch [deleted file]
debian/patches/redefine-alarm-variable.patch [new file with mode: 0644]
debian/patches/series
debian/patches/sort_dirmenu.patch [deleted file]

index 68f2275..d113596 100644 (file)
@@ -1,3 +1,52 @@
+lxpanel (0.5.6-1) unstable; urgency=low
+
+  * New upstream release (Closes:#555575, #577599, #581980) 
+    - Reduced unnecessary flickers during resizing icon grid
+    - Fixed uninitialized variable that causes initial panel color 
+      selector to be wrong
+    - Fixed unlikely memory leak in taskbar icon fetch
+    - Change alpha default to fully opaque
+    - Fixed failure to install CPU Frequency plugin icon
+    - Fixed failure to react to keyboard map changes initiated outside 
+      the plugin
+    - Honor Terminal=true in menu and launchbar
+    - Implemented lxpanelctl config command
+    - Improved clock poll interval for format strings that do not change
+      every second
+    - Fixed conditions where on-disk configuration was not in sync with 
+      actual configuration
+    - Replaced show_all with show on toplevel to avoid situation where 
+      plugin loses control of children's visibility
+    - Fixed 64-bit clean regressions
+    - Fixed some issues with urgency notification
+    - Fixed race condition in task deletion, urgency timer could fire after
+      structure deleted
+    - Fixed race condition in UI draw, cell renderer could be called after
+      plugin structure deleted
+    - Fixed endianness clean issue in lxpanelctl
+    - Fixed segfault if g_locale_to_utf8 fails
+    - Fixed handling of "visible" flag in icon_grid_add
+    - Fixed crash following deleting a plugin from the right-click popup 
+      with the configuration dialog open
+    - Fixed misoperation when symbol string does not have "+inet(evdev)"
+    - Forced group number value into valid range after Xkb query
+    - Ensure that group and symbol names are initialized on all flow paths
+    - Fixed buffer overflow in panel_draw_label_text
+    - Fixed crash when reconfiguring after tray selection failed
+    - Workaround for popup positioning
+    - Fixed CPUFreq plugin 
+    - Changed behavior of strut in Autohide case 
+  * Drop patches that included in upstream:
+    - g_locale_to_utf8.patch 
+    - kbled.patch libtool-fix.patch 
+    - panel_draw_label_text.patch 
+    - sort_dirmenu.patch 
+  * Applied redefine-alarm-variable.patch (Closes:#583986) from 
+    Julien Lavergne <gilir@ubuntu.com>
+  * Bumped Standard-version to 3.9.1 
+
+ -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 28 Jul 2010 16:12:08 -0400
+
 lxpanel (0.5.5-4) unstable; urgency=high
 
   * Added some backport patches to close bugs on BTS and fix a potential 
index 4f82320..3d90f59 100644 (file)
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian LXDE Packaging Team <pkg-lxde-maintainers@lists.alioth.debian.org>
 Uploaders: Andrew Lee (李健秋) <ajqlee@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, intltool, intltool-debian, libgtk2.0-dev (>=2.6), libglib2.0-dev (>=2.10), libxmu-dev, libxpm-dev, libiw-dev [!kfreebsd-i386 !kfreebsd-amd64], libasound2-dev, libmenu-cache1-dev (>=0.3.2), docbook-xml, docbook-xsl, xsltproc, python
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://lxde.org
 Vcs-Git: git://git.debian.org/git/collab-maint/lxpanel.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/lxpanel.git;a=summary
diff --git a/debian/patches/g_locale_to_utf8.patch b/debian/patches/g_locale_to_utf8.patch
deleted file mode 100644 (file)
index c8c1a0b..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/src/plugins/taskbar.c
-+++ b/src/plugins/taskbar.c
-@@ -496,31 +496,34 @@
-     {
-         /* Convert the class to UTF-8 and enter it in the class table. */
-         gchar * res_class = g_locale_to_utf8(ch.res_class, -1, NULL, NULL, NULL);
--        gboolean name_consumed;
--        TaskClass * tc = taskbar_enter_res_class(tk->tb, res_class, &name_consumed);
--        if ( ! name_consumed) g_free(res_class);
--
--        /* If the task changed class, update data structures. */
--        TaskClass * old_tc = tk->res_class;
--        if (old_tc != tc)
-+        if (res_class != NULL)
-         {
--            /* Unlink from previous class, if any. */
--            task_unlink_class(tk);
-+            gboolean name_consumed;
-+            TaskClass * tc = taskbar_enter_res_class(tk->tb, res_class, &name_consumed);
-+            if ( ! name_consumed) g_free(res_class);
--            /* Add to end of per-class task list.  Do this to keep the popup menu in order of creation. */
--            if (tc->res_class_head == NULL)
--                tc->res_class_head = tk;
--            else
-+            /* If the task changed class, update data structures. */
-+            TaskClass * old_tc = tk->res_class;
-+            if (old_tc != tc)
-             {
--                Task * tk_pred;
--                for (tk_pred = tc->res_class_head; tk_pred->res_class_flink != NULL; tk_pred = tk_pred->res_class_flink) ;
--                tk_pred->res_class_flink = tk;
--                task_button_redraw(tk, tk->tb);
--            }
--            tk->res_class = tc;
-+                /* Unlink from previous class, if any. */
-+                task_unlink_class(tk);
--            /* Recompute group visibility. */
--            recompute_group_visibility_for_class(tk->tb, tc);
-+                /* Add to end of per-class task list.  Do this to keep the popup menu in order of creation. */
-+                if (tc->res_class_head == NULL)
-+                    tc->res_class_head = tk;
-+                else
-+                {
-+                    Task * tk_pred;
-+                    for (tk_pred = tc->res_class_head; tk_pred->res_class_flink != NULL; tk_pred = tk_pred->res_class_flink) ;
-+                    tk_pred->res_class_flink = tk;
-+                    task_button_redraw(tk, tk->tb);
-+                }
-+                tk->res_class = tc;
-+
-+                /* Recompute group visibility. */
-+                recompute_group_visibility_for_class(tk->tb, tc);
-+            }
-         }
-         XFree(ch.res_class);
-     }
diff --git a/debian/patches/kbled.patch b/debian/patches/kbled.patch
deleted file mode 100644 (file)
index 5041ea5..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 30932cc7e76cd3f3dcb54867f573a4879befebc0
-Author: Marty Jack <martyj@linux.local>
-Date:   Mon Apr 5 18:23:12 2010 -0400
-
-    Fix handling of "visible" flag in icon_grid_add (Bug2977158)
-    - KBLED is the only place that sometimes passes FALSE here
-
-diff --git a/src/icon-grid.c b/src/icon-grid.c
-index 922057a..23f25d5 100644
---- a/src/icon-grid.c
-+++ b/src/icon-grid.c
-@@ -306,7 +306,8 @@ void icon_grid_add(IconGrid * ig, GtkWidget * child, gboolean visible)
-     }
-     /* Add the widget to the layout container. */
--    gtk_widget_show(ige->widget);
-+    if (visible)
-+        gtk_widget_show(ige->widget);
-     gtk_fixed_put(GTK_FIXED(ig->widget), ige->widget, 0, 0);
-     g_signal_connect(G_OBJECT(child), "size-request", G_CALLBACK(icon_grid_element_size_request), (gpointer) ige);
diff --git a/debian/patches/libtool-fix.patch b/debian/patches/libtool-fix.patch
deleted file mode 100644 (file)
index 616f1b4..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Add libtool missing check to fix 554821 or similar bugs in the future
-
-Author: Andrew Lee (李健秋) <ajqlee@debian.org>
-Bug-Debian: http://bugs.debian.org/558582
-Origin: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554821
-Reviewed-By: Jonas Smedegaard <dr@jones.dk>, Hector Oron <zumbi@debian.org>
-Last-Update: <2010-02-20>
-
---- menu-cache-0.3.1.orig/aclocal.m4
-+++ menu-cache-0.3.1/aclocal.m4
-@@ -4282,6 +4282,7 @@ dnl Note also adjust exclude_expsyms for
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
---- menu-cache-0.3.1.orig/configure
-+++ menu-cache-0.3.1/configure
-@@ -8642,6 +8642,7 @@ $as_echo_n "checking whether the $compil
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-       *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-       *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
diff --git a/debian/patches/panel_draw_label_text.patch b/debian/patches/panel_draw_label_text.patch
deleted file mode 100644 (file)
index 224472e..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-commit cd93c810d7c7ac2bafa53950e012f80ddaacf80a
-Author: Marty Jack <martyj@linux.local>
-Date:   Sun May 9 18:12:37 2010 -0400
-
-    Buffer overflow in panel_draw_label_text (Bug2998726)
-
-diff --git a/src/panel.c b/src/panel.c
-index 6ae6baa..d383d61 100644
---- a/src/panel.c
-+++ b/src/panel.c
-@@ -1054,8 +1054,6 @@ void panel_adjust_geometry_terminology(Panel * p)
- /* Draw text into a label, with the user preference color and optionally bold. */
- void panel_draw_label_text(Panel * p, GtkWidget * label, char * text, gboolean bold, gboolean custom_color)
- {
--    char buffer[512];
--
-     if (text == NULL)
-     {
-         /* Null string. */
-@@ -1068,7 +1066,7 @@ void panel_draw_label_text(Panel * p, GtkWidget * label, char * text, gboolean b
-         int font_desc;
-         if (p->icon_size < 20) 
-             font_desc = 9;
--        else if (p->icon_size >= 20 && p->icon_size < 26)
-+        else if (p->icon_size >= 20 && p->icon_size < 36)
-             font_desc = 10;
-         else
-             font_desc = 12;
-@@ -1091,23 +1089,25 @@ void panel_draw_label_text(Panel * p, GtkWidget * label, char * text, gboolean b
-         if ((custom_color) && (p->usefontcolor))
-         {
-             /* Color, optionally bold. */
--            g_snprintf(buffer, sizeof(buffer), "<span font_desc=\"%d\" color=\"#%06x\">%s%s%s</span>",
-+            gchar * text = g_strdup_printf("<span font_desc=\"%d\" color=\"#%06x\">%s%s%s</span>",
-                 font_desc,
-                 gcolor2rgb24(&p->gfontcolor),
-                 ((bold) ? "<b>" : ""),
-                 valid_markup,
-                 ((bold) ? "</b>" : ""));
--            gtk_label_set_markup(GTK_LABEL(label), buffer);
-+            gtk_label_set_markup(GTK_LABEL(label), text);
-+            g_free(text);
-         }
-         else
-         {
-             /* No color, optionally bold. */
--            g_snprintf(buffer, sizeof(buffer), "<span font_desc=\"%d\">%s%s%s</span>",
-+            gchar * text = g_strdup_printf("<span font_desc=\"%d\">%s%s%s</span>",
-                 font_desc,
-                 ((bold) ? "<b>" : ""),
-                 valid_markup,
-                 ((bold) ? "</b>" : ""));
--            gtk_label_set_markup(GTK_LABEL(label), buffer);
-+            gtk_label_set_markup(GTK_LABEL(label), text);
-+            g_free(text);
-         }
-         g_free(escaped_text);
-     }
diff --git a/debian/patches/redefine-alarm-variable.patch b/debian/patches/redefine-alarm-variable.patch
new file mode 100644 (file)
index 0000000..5742afa
--- /dev/null
@@ -0,0 +1,38 @@
+#http://dep.debian.net/deps/dep3/
+Description: A patch to rename alarm variable already defined in include header.
+
+Origin: Ubuntu
+Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3007605&group_id=180858&atid=894871
+Author: Julien Lavergne <gilir@ubuntu.com>
+Last-Update: 2010-05-26
+
+--- lxpanel-0.5.5.orig/src/plugins/batt/batt.c
++++ lxpanel-0.5.5/src/plugins/batt/batt.c
+@@ -95,15 +95,15 @@ typedef struct {
+ typedef struct {
+     char *command;
+     sem_t *lock;
+-} alarm;
++} alarmStruct;
+ static void destructor(Plugin *p);
+ static void update_display(lx_battery *lx_b, gboolean repaint);
+-/* alarmProcess takes the address of a dynamically allocated alarm struct (which
++/* alarmProcess takes the address of a dynamically allocated alarmStruct struct (which
+    it must free). It ensures that alarm commands do not run concurrently. */
+ static void * alarmProcess(void *arg) {
+-    alarm *a = (alarm *) arg;
++    alarmStruct *a = (alarmStruct *) arg;
+     sem_wait(a->lock);
+     system(a->command);
+@@ -157,7 +157,7 @@ void update_display(lx_battery *lx_b, gb
+       /* Run the alarm command if it isn't already running */
+       if (alarmCanRun) {
+           
+-          alarm *a = (alarm *) malloc(sizeof(alarm));
++          alarmStruct *a = (alarmStruct *) malloc(sizeof(alarmStruct));
+           a->command = lx_b->alarmCommand;
+           a->lock = &(lx_b->alarmProcessLock);
+           
index b3fefe1..fd6dd49 100644 (file)
@@ -1,8 +1,4 @@
-libtool-fix.patch
-panel_draw_label_text.patch
-kbled.patch
 batt_status.patch
-sort_dirmenu.patch
 missing_glades.patch
 default-config.patch
-g_locale_to_utf8.patch
+redefine-alarm-variable.patch
diff --git a/debian/patches/sort_dirmenu.patch b/debian/patches/sort_dirmenu.patch
deleted file mode 100644 (file)
index ceb5555..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-commit 8456e26ac9b583a48d82ea17c196bf8756ed9dd5
-Author: Marty Jack <martyj@linux.local>
-Date:   Sun Apr 18 11:06:47 2010 -0400
-
-    Sort menu items in Directory Menu (Bug2977155)
-
-diff --git a/src/plugins/dirmenu.c b/src/plugins/dirmenu.c
-index cfaa12b..50852a1 100644
---- a/src/plugins/dirmenu.c
-+++ b/src/plugins/dirmenu.c
-@@ -28,6 +28,13 @@
- #include "plugin.h"
- #include "dbg.h"
-+/* Temporary for sort of directory names. */
-+typedef struct _directory_name {
-+    struct _directory_name * flink;
-+    char * directory_name;
-+    char * directory_name_collate_key;
-+} DirectoryName;
-+
- /* Private context for directory menu plugin. */
- typedef struct {
-     Plugin * plugin;                  /* Back pointer to plugin */
-@@ -162,11 +169,12 @@ static GtkWidget * dirmenu_create_menu(Plugin * p, const char * path, gboolean o
-     g_object_set_data_full(G_OBJECT(menu), "path", g_strdup(path), g_free);
-     /* Scan the specified directory to populate the menu with its subdirectories. */
-+    DirectoryName * dir_list = NULL;
-     GDir * dir = g_dir_open(path, 0, NULL);
-     if (dir != NULL)
-     {
-         const char * name;
--        while ((name = g_dir_read_name(dir)) != NULL)
-+        while ((name = g_dir_read_name(dir)) != NULL) /* Memory owned by glib */
-         {
-             /* Omit hidden files. */
-             if (name[0] != '.')
-@@ -174,19 +182,33 @@ static GtkWidget * dirmenu_create_menu(Plugin * p, const char * path, gboolean o
-                 char * full = g_build_filename(path, name, NULL);
-                 if (g_file_test(full, G_FILE_TEST_IS_DIR))
-                 {
--                    char * disp = g_filename_display_name(name);
--                    GtkWidget * item = gtk_image_menu_item_new_with_label(disp);
--                    g_free(disp);
--
--                    g_object_set_data_full(G_OBJECT(item), "name", g_strdup(name), g_free);
--                    gtk_image_menu_item_set_image(
--                        GTK_IMAGE_MENU_ITEM(item),
--                        gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU));
--                    GtkWidget * dummy = gtk_menu_new();
--                    gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), dummy);
--                    gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
--                    g_signal_connect(item, "select", G_CALLBACK(dirmenu_menuitem_select), p);
--                    g_signal_connect(item, "deselect", G_CALLBACK(dirmenu_menuitem_deselect), p);
-+                    /* Convert name to UTF-8 and to the collation key. */
-+                    char * directory_name = g_filename_display_name(name);
-+                    char * directory_name_collate_key = g_utf8_collate_key(directory_name, -1);
-+
-+                    /* Locate insertion point. */
-+                    DirectoryName * dir_pred = NULL;
-+                    DirectoryName * dir_cursor;
-+                    for (dir_cursor = dir_list; dir_cursor != NULL; dir_pred = dir_cursor, dir_cursor = dir_cursor->flink)
-+                    {
-+                        if (strcmp(directory_name_collate_key, dir_cursor->directory_name_collate_key) <= 0)
-+                            break;
-+                    }
-+
-+                    /* Allocate and initialize sorted directory name entry. */
-+                    dir_cursor = g_new0(DirectoryName, 1);
-+                    dir_cursor->directory_name = directory_name;
-+                    dir_cursor->directory_name_collate_key = directory_name_collate_key;
-+                    if (dir_pred == NULL)
-+                    {
-+                        dir_cursor->flink = dir_list;
-+                        dir_list = dir_cursor;
-+                    }
-+                    else
-+                    {
-+                        dir_cursor->flink = dir_pred->flink;
-+                        dir_pred->flink = dir_cursor;
-+                    }
-                 }
-                 g_free(full);
-             }
-@@ -194,6 +216,30 @@ static GtkWidget * dirmenu_create_menu(Plugin * p, const char * path, gboolean o
-         g_dir_close(dir);
-     }
-+    /* The sorted directory name list is complete.  Loop to create the menu. */
-+    DirectoryName * dir_cursor;
-+    while ((dir_cursor = dir_list) != NULL)
-+    {
-+        /* Create and initialize menu item. */
-+        GtkWidget * item = gtk_image_menu_item_new_with_label(dir_cursor->directory_name);
-+        gtk_image_menu_item_set_image(
-+            GTK_IMAGE_MENU_ITEM(item),
-+            gtk_image_new_from_stock(GTK_STOCK_DIRECTORY, GTK_ICON_SIZE_MENU));
-+        GtkWidget * dummy = gtk_menu_new();
-+        gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), dummy);
-+        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
-+
-+        /* Unlink and free sorted directory name element, but reuse the directory name string. */
-+        dir_list = dir_cursor->flink;
-+        g_object_set_data_full(G_OBJECT(item), "name", dir_cursor->directory_name, g_free);
-+        g_free(dir_cursor->directory_name_collate_key);
-+        g_free(dir_cursor);
-+
-+        /* Connect signals. */
-+        g_signal_connect(G_OBJECT(item), "select", G_CALLBACK(dirmenu_menuitem_select), p);
-+        g_signal_connect(G_OBJECT(item), "deselect", G_CALLBACK(dirmenu_menuitem_deselect), p);
-+    }
-+
-     /* Create "Open" and "Open in Terminal" items. */
-     GtkWidget * item = gtk_image_menu_item_new_from_stock( GTK_STOCK_OPEN, NULL );
-     g_signal_connect(item, "activate", G_CALLBACK(dirmenu_menuitem_open_directory), p);