[Pkg-xfce-commits] r4162 - in goodies/tags/xfce4-indicator-plugin: . 0.0.1-2/debian 0.0.1-2/debian/patches

Evgeni Golov evgeni at alioth.debian.org
Wed Jul 14 07:41:59 UTC 2010


Author: evgeni
Date: 2010-07-14 07:41:56 +0000 (Wed, 14 Jul 2010)
New Revision: 4162

Added:
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/02_menu_on_no-indicators.patch
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/03_skip_pofiles_in_patches.patch
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series
Removed:
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch
   goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series
Log:
[svn-buildpackage] Tagging xfce4-indicator-plugin 0.0.1-2

Deleted: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/changelog	2010-06-04 07:35:37 UTC (rev 4123)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog	2010-07-14 07:41:56 UTC (rev 4162)
@@ -1,5 +0,0 @@
-xfce4-indicator-plugin (0.0.1-1) UNRELEASED; urgency=low
-
-  * Initial release                                            closes: #534555
-
- -- Evgeni Golov <evgeni at debian.org>  Mon, 31 May 2010 11:42:49 +0200

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog (from rev 4161, goodies/trunk/xfce4-indicator-plugin/debian/changelog)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/changelog	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,17 @@
+xfce4-indicator-plugin (0.0.1-2) unstable; urgency=low
+
+  * debian/control:
+    + Add Provides: indicator-renderer
+    + Add Recommends: indicator-messages
+  * debian/patches/02_menu_on_no-indicators.patch
+    + Display a menu even when there are no indicators.        closes: #587167
+  * debian/patches/03_skip_pofiles_in_patches.patch
+    + Split the POTFILES.skip patch out, list all changed files in there.
+
+ -- Evgeni Golov <evgeni at debian.org>  Wed, 14 Jul 2010 09:35:08 +0200
+
+xfce4-indicator-plugin (0.0.1-1) unstable; urgency=low
+
+  * Initial release                                            closes: #534555
+
+ -- Evgeni Golov <evgeni at debian.org>  Sun, 13 Jun 2010 17:14:30 +0200

Deleted: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/control	2010-06-04 07:35:37 UTC (rev 4123)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control	2010-07-14 07:41:56 UTC (rev 4162)
@@ -1,21 +0,0 @@
-Source: xfce4-indicator-plugin
-Section: xfce
-Priority: optional
-Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
- Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
- Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, libindicator-dev (>=0.3.0),
- intltool
-Standards-Version: 3.8.4
-Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/
-Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
-
-Package: xfce4-indicator-plugin
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: plugin to display information from applications in the Xfce4 panel
- A small plugin to display information from various applications consistently
- in the Xfce4 panel as described in Ubuntus MessagingMenu design specification.
-

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control (from rev 4137, goodies/trunk/xfce4-indicator-plugin/debian/control)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/control	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,23 @@
+Source: xfce4-indicator-plugin
+Section: xfce
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
+ Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
+ Evgeni Golov <evgeni at debian.org>
+Build-Depends: debhelper (>= 7), libxfcegui4-dev, xfce4-panel-dev, libindicator-dev (>=0.3.0),
+ intltool
+Standards-Version: 3.8.4
+Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/
+
+Package: xfce4-indicator-plugin
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: indicator-renderer
+Recommends: indicator-messages
+Description: plugin to display information from applications in the Xfce4 panel
+ A small plugin to display information from various applications consistently
+ in the Xfce4 panel as described in Ubuntus MessagingMenu design specification.
+

Deleted: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/copyright	2010-06-04 07:35:37 UTC (rev 4123)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright	2010-07-14 07:41:56 UTC (rev 4162)
@@ -1,16 +0,0 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: xfce4-indicator-plugin
-Maintainer: Mark Trompell <mark at foresightlinux.org>
-Source: http://goodies.xfce.org/releases/xfce4-indicator-plugin/
-
-Files: *
-Copyright: 2009 Mark Trompell <mark at foresightlinux.org>
-License: GPL-2+
-
-Files: debian/*
-Copyright: 2009 Evgeni Golov <evgeni at debian.org>
-License: GPL-2+
-
-License: GPL-2+
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright (from rev 4124, goodies/trunk/xfce4-indicator-plugin/debian/copyright)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/copyright	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,16 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: xfce4-indicator-plugin
+Maintainer: Mark Trompell <mark at foresightlinux.org>
+Source: http://goodies.xfce.org/releases/xfce4-indicator-plugin/
+
+Files: *
+Copyright: 2009 Mark Trompell <mark at foresightlinux.org>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 2009-2010 Evgeni Golov <evgeni at debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.

Deleted: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch	2010-06-04 07:35:37 UTC (rev 4123)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch	2010-07-14 07:41:56 UTC (rev 4162)
@@ -1,112 +0,0 @@
-#diff -r e02fa5b5ff30 configure.in.in
-#--- a/configure.in.in	Fri Oct 23 15:03:46 2009 +0200
-#+++ b/configure.in.in	Mon May 31 13:11:30 2010 +0200
-#@@ -65,7 +65,7 @@
-# XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
-# XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
-# XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
-#-XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.2.0])
-#+XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0])
-# 
-# dnl ***********************************
-# dnl *** Check for debugging support ***
-diff -r e02fa5b5ff30 panel-plugin/indicator.c
---- a/panel-plugin/indicator.c	Fri Oct 23 15:03:46 2009 +0200
-+++ b/panel-plugin/indicator.c	Mon May 31 13:11:30 2010 +0200
-@@ -26,7 +26,7 @@
- #include <libxfce4util/libxfce4util.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-hvbox.h>
--#include <libindicator/indicator.h>
-+#include <libindicator/indicator-object.h>
- 
- #include "indicator.h"
- 
-@@ -318,57 +318,35 @@
- 	g_debug("Loading Module: %s", name);
- 
- 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
--	GModule * module = g_module_open(fullpath,
--                                     G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
-+	IndicatorObject * io = indicator_object_new_from_file(fullpath);
- 	g_free(fullpath);
--	g_return_val_if_fail(module != NULL, FALSE);
- 
--	get_version_t lget_version = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE);
--	if (!INDICATOR_VERSION_CHECK(lget_version())) {
--		g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION);
--		return FALSE;
-+	GList * entries = indicator_object_get_entries(io);
-+	GList * entry = NULL;
-+
-+	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
-+		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
-+
-+		GtkWidget * menuitem = gtk_menu_item_new();
-+		GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
-+		if (entrydata->image != NULL) {
-+			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->image), FALSE, FALSE, 0);
-+		}
-+		if (entrydata->label != NULL) {
-+			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->label), FALSE, FALSE, 0);
-+		}
-+		gtk_container_add(GTK_CONTAINER(menuitem), hbox);
-+		gtk_widget_show(hbox);
-+
-+		if (entrydata->menu != NULL) {
-+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entrydata->menu));
-+		}
-+
-+		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-+		gtk_widget_show(menuitem);
- 	}
- 
--	get_label_t lget_label = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE);
--	g_return_val_if_fail(lget_label != NULL, FALSE);
--	GtkLabel * label = lget_label();
--
--	get_icon_t lget_icon = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE);
--	g_return_val_if_fail(lget_icon != NULL, FALSE);
--	GtkImage * icon = lget_icon();
--
--	get_menu_t lget_menu = NULL;
--	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE);
--	g_return_val_if_fail(lget_menu != NULL, FALSE);
--	GtkMenu * lmenu = lget_menu();
--
--	if (label == NULL && icon == NULL) {
--		/* This is the case where there is nothing to display,
--		   kinda odd that we'd have a module with nothing. */
--		g_warning("No label or icon.  Odd.");
--		return FALSE;
--	}
--
--	GtkWidget * menuitem = gtk_menu_item_new();
--	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
--	if (icon != NULL) {
--		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(icon), FALSE, FALSE, 0);
--	}
--	if (label != NULL) {
--		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
--	}
--	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
--	gtk_widget_show(hbox);
--
--	if (lmenu != NULL) {
--		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu));
--	}
--
--	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
--	gtk_widget_show(menuitem);
-+	g_list_free(entries);
- 
- 	return TRUE;
- }
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/po/POTFILES.skip	Mon May 31 13:17:51 2010 +0200
-@@ -0,0 +1,1 @@
-+.pc/01_libindicator0.3.0_compat.patch/panel-plugin/indicator.c
-

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch (from rev 4154, goodies/trunk/xfce4-indicator-plugin/debian/patches/01_libindicator0.3.0_compat.patch)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/01_libindicator0.3.0_compat.patch	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,146 @@
+Description: fix compilation with libindicator >=0.3
+Forwarded: Yes
+Author: Evgeni Golov <evgeni at debian.org>
+Applied-Upstream: http://hg.foresightlinux.org/xfce/xfce4-indicator-plugin/rev/630cdff47172
+Last-Update: 2010-05-31
+
+#diff -r e02fa5b5ff30 configure.in.in
+#--- a/configure.in.in	Fri Oct 23 15:03:46 2009 +0200
+#+++ b/configure.in.in	Mon May 31 13:11:30 2010 +0200
+#@@ -65,7 +65,7 @@
+# XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
+# XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
+# XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99.2])
+#-XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.2.0])
+#+XDT_CHECK_PACKAGE([INDICATOR], [indicator], [0.3.0])
+# 
+# dnl ***********************************
+# dnl *** Check for debugging support ***
+Index: xfce4-indicator-plugin-0.0.1/panel-plugin/indicator.c
+===================================================================
+--- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/indicator.c	2010-06-13 18:00:28.372224709 +0200
++++ xfce4-indicator-plugin-0.0.1/panel-plugin/indicator.c	2010-06-13 18:57:35.276310144 +0200
+@@ -26,7 +26,7 @@
+ #include <libxfce4util/libxfce4util.h>
+ #include <libxfce4panel/xfce-panel-plugin.h>
+ #include <libxfce4panel/xfce-hvbox.h>
+-#include <libindicator/indicator.h>
++#include <libindicator/indicator-object.h>
+ 
+ #include "indicator.h"
+ 
+@@ -34,7 +34,7 @@
+ #define DEFAULT_SETTING1 NULL
+ #define DEFAULT_SETTING2 1
+ #define DEFAULT_SETTING3 FALSE
+-#define ICONS_DIR  (DATADIR G_DIR_SEPARATOR_S "indicator-applet" G_DIR_SEPARATOR_S "icons")
++#define ICONS_DIR "/usr/share/libindicator/icons/"
+ 
+ 
+ /* prototypes */
+@@ -320,57 +320,35 @@
+ 	g_debug("Loading Module: %s", name);
+ 
+ 	gchar * fullpath = g_build_filename(INDICATOR_DIR, name, NULL);
+-	GModule * module = g_module_open(fullpath,
+-                                     G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
++	IndicatorObject * io = indicator_object_new_from_file(fullpath);
+ 	g_free(fullpath);
+-	g_return_val_if_fail(module != NULL, FALSE);
+ 
+-	get_version_t lget_version = NULL;
+-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_VERSION_S, (gpointer *)(&lget_version)), FALSE);
+-	if (!INDICATOR_VERSION_CHECK(lget_version())) {
+-		g_warning("Indicator using API version '%s' we're expecting '%s'", lget_version(), INDICATOR_VERSION);
+-		return FALSE;
+-	}
++	GList * entries = indicator_object_get_entries(io);
++	GList * entry = NULL;
+ 
+-	get_label_t lget_label = NULL;
+-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_LABEL_S, (gpointer *)(&lget_label)), FALSE);
+-	g_return_val_if_fail(lget_label != NULL, FALSE);
+-	GtkLabel * label = lget_label();
+-
+-	get_icon_t lget_icon = NULL;
+-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_ICON_S, (gpointer *)(&lget_icon)), FALSE);
+-	g_return_val_if_fail(lget_icon != NULL, FALSE);
+-	GtkImage * icon = lget_icon();
+-
+-	get_menu_t lget_menu = NULL;
+-	g_return_val_if_fail(g_module_symbol(module, INDICATOR_GET_MENU_S, (gpointer *)(&lget_menu)), FALSE);
+-	g_return_val_if_fail(lget_menu != NULL, FALSE);
+-	GtkMenu * lmenu = lget_menu();
+-
+-	if (label == NULL && icon == NULL) {
+-		/* This is the case where there is nothing to display,
+-		   kinda odd that we'd have a module with nothing. */
+-		g_warning("No label or icon.  Odd.");
+-		return FALSE;
+-	}
++	for (entry = entries; entry != NULL; entry = g_list_next(entry)) {
++		IndicatorObjectEntry * entrydata = (IndicatorObjectEntry *)entry->data;
+ 
+-	GtkWidget * menuitem = gtk_menu_item_new();
+-	GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
+-	if (icon != NULL) {
+-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(icon), FALSE, FALSE, 0);
+-	}
+-	if (label != NULL) {
+-		gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(label), FALSE, FALSE, 0);
+-	}
+-	gtk_container_add(GTK_CONTAINER(menuitem), hbox);
+-	gtk_widget_show(hbox);
++		GtkWidget * menuitem = gtk_menu_item_new();
++		GtkWidget * hbox = gtk_hbox_new(FALSE, 3);
++		if (entrydata->image != NULL) {
++			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->image), FALSE, FALSE, 0);
++		}
++		if (entrydata->label != NULL) {
++			gtk_box_pack_start(GTK_BOX(hbox), GTK_WIDGET(entrydata->label), FALSE, FALSE, 0);
++		}
++		gtk_container_add(GTK_CONTAINER(menuitem), hbox);
++		gtk_widget_show(hbox);
++
++		if (entrydata->menu != NULL) {
++			gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(entrydata->menu));
++		}
+ 
+-	if (lmenu != NULL) {
+-		gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), GTK_WIDGET(lmenu));
++		gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
++		gtk_widget_show(menuitem);
+ 	}
+ 
+-	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+-	gtk_widget_show(menuitem);
++	g_list_free(entries);
+ 
+ 	return TRUE;
+ }
+Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am
+===================================================================
+--- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.am	2010-06-13 18:01:02.988286674 +0200
++++ xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.am	2010-06-13 18:56:45.432223655 +0200
+@@ -24,7 +24,7 @@
+ 	$(INDICATOR_CFLAGS)						\
+ 	$(PLATFORM_CFLAGS)					\
+ 	-DDATADIR=\""$(datadir)"\" 				\
+-	-DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
++	-DINDICATOR_DIR=\""$(libdir)/indicators/3"\"
+ 
+ 
+ xfce4_indicator_plugin_LDADD =					\
+Index: xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.in
+===================================================================
+--- xfce4-indicator-plugin-0.0.1.orig/panel-plugin/Makefile.in	2010-06-13 19:01:13.216725094 +0200
++++ xfce4-indicator-plugin-0.0.1/panel-plugin/Makefile.in	2010-06-13 19:01:22.384224345 +0200
+@@ -273,7 +273,7 @@
+ 	$(INDICATOR_CFLAGS)						\
+ 	$(PLATFORM_CFLAGS)					\
+ 	-DDATADIR=\""$(datadir)"\" 				\
+-	-DINDICATOR_DIR=\""$(libdir)/indicators/2"\"
++	-DINDICATOR_DIR=\""$(libdir)/indicators/3"\"
+ 
+ xfce4_indicator_plugin_LDADD = \
+ 	$(LIBXFCE4UTIL_LIBS)						\

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/02_menu_on_no-indicators.patch (from rev 4153, goodies/trunk/xfce4-indicator-plugin/debian/patches/02_menu_on_no-indicators.patch)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/02_menu_on_no-indicators.patch	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/02_menu_on_no-indicators.patch	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,27 @@
+Description: add a menu in the case there are no indicators
+Forwarded: Yes
+Author: Evgeni Golov <evgeni at debian.org>
+Bug-Debian: http://bugs.debian.org/587167
+Last-Update: 2010-06-29
+
+diff -r 630cdff47172 panel-plugin/indicator.c
+--- a/panel-plugin/indicator.c	Mon Jun 07 11:12:31 2010 +0200
++++ b/panel-plugin/indicator.c	Tue Jun 29 08:42:35 2010 +0200
+@@ -204,7 +204,8 @@
+ 
+   if (indicators_loaded == 0) {
+     /* A label to allow for click through */
+-    indicator->item = gtk_label_new(_("No Indicators"));
++    indicator->item = xfce_create_panel_button();
++    gtk_button_set_label(indicator->item, _("No Indicators"));
+     gtk_widget_show(indicator->item);
+     gtk_container_add (GTK_CONTAINER (plugin), indicator->item);
+   } else {
+@@ -293,6 +294,7 @@
+ 
+   /* show the panel's right-click menu on this menu */
+   xfce_panel_plugin_add_action_widget (plugin, indicator->menu);
++  xfce_panel_plugin_add_action_widget (plugin, indicator->item);
+ 
+   /* connect plugin signals */
+   g_signal_connect (G_OBJECT (plugin), "free-data",

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/03_skip_pofiles_in_patches.patch (from rev 4154, goodies/trunk/xfce4-indicator-plugin/debian/patches/03_skip_pofiles_in_patches.patch)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/03_skip_pofiles_in_patches.patch	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/03_skip_pofiles_in_patches.patch	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,14 @@
+Description: skip files under .pc which contain translatable strings
+ the build will fail otherwise in update-po
+Forwarded: not-needed
+Author: Evgeni Golov <evgeni at debian.org>
+Last-Update: 2010-06-29
+
+Index: xfce4-indicator-plugin-0.0.1/po/POTFILES.skip
+===================================================================
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ xfce4-indicator-plugin-0.0.1/po/POTFILES.skip       2010-06-13 18:00:35.548755923 +0200
+@@ -0,0 +1,2 @@
++.pc/01_libindicator0.3.0_compat.patch/panel-plugin/indicator.c
++.pc/02_menu_on_no-indicators.patch/panel-plugin/indicator.c
+

Deleted: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series
===================================================================
--- goodies/trunk/xfce4-indicator-plugin/debian/patches/series	2010-06-04 07:35:37 UTC (rev 4123)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series	2010-07-14 07:41:56 UTC (rev 4162)
@@ -1 +0,0 @@
-01_libindicator0.3.0_compat.patch

Copied: goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series (from rev 4154, goodies/trunk/xfce4-indicator-plugin/debian/patches/series)
===================================================================
--- goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series	                        (rev 0)
+++ goodies/tags/xfce4-indicator-plugin/0.0.1-2/debian/patches/series	2010-07-14 07:41:56 UTC (rev 4162)
@@ -0,0 +1,3 @@
+01_libindicator0.3.0_compat.patch
+02_menu_on_no-indicators.patch
+03_skip_pofiles_in_patches.patch




More information about the Pkg-xfce-commits mailing list