diff -Nru lxpanel-0.8.1/debian/changelog lxpanel-0.8.1/debian/changelog --- lxpanel-0.8.1/debian/changelog 2015-10-10 20:36:50.000000000 +0000 +++ lxpanel-0.8.1/debian/changelog 2015-10-13 10:34:55.000000000 +0000 @@ -1,10 +1,10 @@ -lxpanel (0.8.1-1ubuntu2~ppa1) wily; urgency=medium +lxpanel (0.8.1-1ubuntu2~ppa3) wily; urgency=medium - * debian/patches/05_revert_indicator_0.7.2.patch - - Revert indicator plugin to 0.7.2 version, to avoid dupplicate icons - (LP: #1488660) + * debian/patches/05_load_indicator_once.patch + - Don't load the indicator when creating the applet, it can be loaded twice + (LP: #1488660) - -- Julien Lavergne Sat, 10 Oct 2015 22:32:57 +0200 + -- Julien Lavergne Tue, 13 Oct 2015 12:34:47 +0200 lxpanel (0.8.1-1ubuntu1) wily; urgency=medium diff -Nru lxpanel-0.8.1/debian/patches/05_load_indicator_once.patch lxpanel-0.8.1/debian/patches/05_load_indicator_once.patch --- lxpanel-0.8.1/debian/patches/05_load_indicator_once.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxpanel-0.8.1/debian/patches/05_load_indicator_once.patch 2015-10-13 08:57:26.000000000 +0000 @@ -0,0 +1,13 @@ +Index: lxpanel-0.8.1/plugins/indicator/indicator.c +=================================================================== +--- lxpanel-0.8.1.orig/plugins/indicator/indicator.c 2015-10-13 10:55:33.413955017 +0200 ++++ lxpanel-0.8.1/plugins/indicator/indicator.c 2015-10-13 10:57:18.615377167 +0200 +@@ -792,7 +792,7 @@ + gtk_container_set_border_width(GTK_CONTAINER(indicator->menubar), 0); + + /* load 'em */ +- indicator_load_modules(panel, p); ++ //indicator_load_modules(panel, p); + + return p; + } diff -Nru lxpanel-0.8.1/debian/patches/05_revert_indicator_0.7.2.patch lxpanel-0.8.1/debian/patches/05_revert_indicator_0.7.2.patch --- lxpanel-0.8.1/debian/patches/05_revert_indicator_0.7.2.patch 2015-10-10 20:32:06.000000000 +0000 +++ lxpanel-0.8.1/debian/patches/05_revert_indicator_0.7.2.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,81 +0,0 @@ -Index: lxpanel-0.8.1/plugins/indicator/indicator.c -=================================================================== ---- lxpanel-0.8.1.orig/plugins/indicator/indicator.c 2015-10-10 22:30:22.000000000 +0200 -+++ lxpanel-0.8.1/plugins/indicator/indicator.c 2015-10-10 22:32:00.804938265 +0200 -@@ -519,7 +519,6 @@ - return TRUE; - } - --#if 0 - static void - log_to_file_cb (GObject * source_obj G_GNUC_UNUSED, - GAsyncResult * result G_GNUC_UNUSED, gpointer user_data) -@@ -575,7 +574,6 @@ - - return; - } --#endif - - static gboolean - menubar_press (GtkWidget * widget, -@@ -626,6 +624,8 @@ - gint indicators_loaded = 0; - IndicatorPlugin * indicator = lxpanel_plugin_get_data(p); - -+ gtk_widget_hide_all(p); -+ - gtk_container_forall(GTK_CONTAINER(indicator->menubar), - (GtkCallback)gtk_widget_destroy, NULL); - -@@ -683,22 +683,21 @@ - g_dir_close (dir); - } - -- /* Update the plugin container contents */ -- if (gtk_bin_get_child(GTK_BIN(p))) -- gtk_container_remove(GTK_CONTAINER(p), gtk_bin_get_child(GTK_BIN(p))); - if (indicators_loaded == 0) - { - /* A label to allow for click through */ -- GtkWidget *label = gtk_label_new(_("No Indicators")); -- gtk_widget_show(label); -- gtk_container_add(GTK_CONTAINER(p), label); -+ gtk_container_add(GTK_CONTAINER(p), gtk_label_new(_("No Indicators"))); - } - else - { - gtk_container_add(GTK_CONTAINER(p), indicator->menubar); -- /* Enforce background */ -- plugin_widget_set_background(indicator->menubar, panel); -+ /* Set background to default. */ -+ gtk_widget_set_style(indicator->menubar, panel_get_defstyle(panel)); - } -+ -+ /* Update the display, show the widget, and return. */ -+ gtk_widget_show_all(p); -+ - } - - /* Plugin constructor. */ -@@ -770,11 +769,10 @@ - gtk_widget_set_name(p, "fast-user-switch-applet"); - - /* Connect signals for container */ -- //g_log_set_default_handler(log_to_file, NULL); -+ g_log_set_default_handler(log_to_file, NULL); - - /* Allocate icon as a child of top level. */ -- indicator->menubar = g_object_ref_sink(gtk_menu_bar_new()); -- gtk_widget_show(indicator->menubar); -+ indicator->menubar = gtk_menu_bar_new(); - gtk_widget_set_can_focus(indicator->menubar, TRUE); - - /* Init some theme/icon stuff */ -@@ -804,7 +802,6 @@ - IndicatorPlugin * indicator = (IndicatorPlugin *) user_data; - - /* Deallocate all memory. */ -- g_object_unref(indicator->menubar); - g_free(indicator); - } - #endif diff -Nru lxpanel-0.8.1/debian/patches/series lxpanel-0.8.1/debian/patches/series --- lxpanel-0.8.1/debian/patches/series 2015-10-10 20:33:34.000000000 +0000 +++ lxpanel-0.8.1/debian/patches/series 2015-10-13 10:31:41.000000000 +0000 @@ -1,3 +1,4 @@ 01-default-config.patch 04_disable_gtk3_indicators.patch -05_revert_indicator_0.7.2.patch + +05_load_indicator_once.patch diff -Nru lxpanel-0.8.1/debian/patches/test lxpanel-0.8.1/debian/patches/test --- lxpanel-0.8.1/debian/patches/test 1970-01-01 00:00:00.000000000 +0000 +++ lxpanel-0.8.1/debian/patches/test 2015-10-13 08:59:03.000000000 +0000 @@ -0,0 +1,266 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + lxpanel (0.8.1-1ubuntu1) wily; urgency=medium + . + * Merge with Debian. Ubuntu remaining changes: + * debian/control: + - Add libindicator-dev build-depends. + - Add a recommend on xterm | pavucontrol | gnome-alsamixer to enable the + mixer on the sound applet. (LP: #957749). + - Add build-depends on libicu-dev for weather plugin. + - Update Replaces and Breaks (LP: #1417244). + * debian/local/source_lxpanel.py: + - Add apport hook. + * debian/lxpanel.install: + - Install all plugins except indicators. + - Install apport hook. + * debian/lxpanel-indicator-applet-plugin.install: + - Install indicator plugin. + * debian/rules: + - Add --enable-indicator-support flag. + - Add dh_install --fail-missing. + - Re-enable dh_makeshlibs, FTBFS with lxpanel-indicator-applet-plugin. + * debian/patches: + - 04_disable_gtk3_indicators.patch: Hide incompatible indicators in the + preference menu (LP: #1165245). +Author: Julien Lavergne +Bug-Ubuntu: https://bugs.launchpad.net/bugs/957749 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1165245 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1417244 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: https://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- lxpanel-0.8.1.orig/configure ++++ lxpanel-0.8.1/configure +@@ -645,6 +645,7 @@ PO_IN_DATADIR_TRUE + INTLLIBS + INSTOBJEXT + GMOFILES ++DATADIRNAME + CATOBJEXT + CATALOGS + MSGFMT_OPTS +@@ -709,7 +710,6 @@ build + LIBTOOL + ac_ct_AR + AR +-DATADIRNAME + ALL_LINGUAS + INTLTOOL_PERL + GMSGFMT +@@ -1737,73 +1737,6 @@ fi + + } # ac_fn_c_try_link + +-# ac_fn_c_check_func LINENO FUNC VAR +-# ---------------------------------- +-# Tests whether FUNC exists, setting the cache variable VAR accordingly +-ac_fn_c_check_func () +-{ +- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +-$as_echo_n "checking for $2... " >&6; } +-if eval \${$3+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-/* Define $2 to an innocuous variant, in case declares $2. +- For example, HP-UX 11i declares gettimeofday. */ +-#define $2 innocuous_$2 +- +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char $2 (); below. +- Prefer to if __STDC__ is defined, since +- exists even on freestanding compilers. */ +- +-#ifdef __STDC__ +-# include +-#else +-# include +-#endif +- +-#undef $2 +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char $2 (); +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined __stub_$2 || defined __stub___$2 +-choke me +-#endif +- +-int +-main () +-{ +-return $2 (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- eval "$3=yes" +-else +- eval "$3=no" +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +-eval ac_res=\$$3 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +-$as_echo "$ac_res" >&6; } +- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno +- +-} # ac_fn_c_check_func +- + # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- + # Tests whether HEADER exists and can be compiled using the include files in +@@ -1914,6 +1847,73 @@ fi + + } # ac_fn_c_try_run + ++# ac_fn_c_check_func LINENO FUNC VAR ++# ---------------------------------- ++# Tests whether FUNC exists, setting the cache variable VAR accordingly ++ac_fn_c_check_func () ++{ ++ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 ++$as_echo_n "checking for $2... " >&6; } ++if eval \${$3+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++/* Define $2 to an innocuous variant, in case declares $2. ++ For example, HP-UX 11i declares gettimeofday. */ ++#define $2 innocuous_$2 ++ ++/* System header to define __stub macros and hopefully few prototypes, ++ which can conflict with char $2 (); below. ++ Prefer to if __STDC__ is defined, since ++ exists even on freestanding compilers. */ ++ ++#ifdef __STDC__ ++# include ++#else ++# include ++#endif ++ ++#undef $2 ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char $2 (); ++/* The GNU C library defines this for functions which it implements ++ to always fail with ENOSYS. Some functions are actually named ++ something starting with __ and the normal name is an alias. */ ++#if defined __stub_$2 || defined __stub___$2 ++choke me ++#endif ++ ++int ++main () ++{ ++return $2 (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ eval "$3=yes" ++else ++ eval "$3=no" ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++fi ++eval ac_res=\$$3 ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 ++$as_echo "$ac_res" >&6; } ++ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno ++ ++} # ac_fn_c_check_func ++ + # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES + # ------------------------------------------------------- + # Tests whether HEADER exists, giving a warning if it cannot be compiled using +@@ -4111,7 +4111,6 @@ $as_echo "$USE_NLS" >&6; } + + + +- + case "$am__api_version" in + 1.01234) + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 +@@ -4634,43 +4633,6 @@ fi + # Substitute ALL_LINGUAS so we can use it in po/Makefile + + +-# Set DATADIRNAME correctly if it is not set yet +-# (copied from glib-gettext.m4) +-if test -z "$DATADIRNAME"; then +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-int +-main () +-{ +-extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- DATADIRNAME=share +-else +- case $host in +- *-*-solaris*) +- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : +- DATADIRNAME=share +-else +- DATADIRNAME=lib +-fi +- +- ;; +- *) +- DATADIRNAME=lib +- ;; +- esac +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-fi +- + + +