debian/0000775000000000000000000000000012321362434007170 5ustar debian/rules0000775000000000000000000000073512321362340010251 0ustar #!/usr/bin/make -f include /usr/share/dpkg/pkg-info.mk include /usr/share/dpkg/architecture.mk export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 export DEB_BUILD_MAINT_OPTIONS=hardening=+all override_dh_auto_install: dh_auto_install find debian/$(DEB_SOURCE)/ -name '*.la' -delete override_dh_makeshlibs: dh_makeshlibs -X debian/$(DEB_SOURCE)/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/lib*-plugin.so %: dh $@ --parallel --with autotools-dev debian/watch0000664000000000000000000000021312321362340010211 0ustar version=3 http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/([\d\.]+)/ \ xfce4-indicator-plugin-([\d\.]+)\.tar\.(?:gz|bz2) debian/changelog0000664000000000000000000002025612321362355011051 0ustar xfce4-indicator-plugin (2.3.2-0ubuntu2) trusty; urgency=medium * Add 01_upstart-init.patch (Fixes LP: #1302571) -- Sean Davis Mon, 07 Apr 2014 21:48:58 -0400 xfce4-indicator-plugin (2.3.2-0ubuntu1) trusty; urgency=medium * New upstream release. - Fixed xfce bug #10749: "blank properties window". LP: #1290803 -- Jackson Doak Sun, 16 Mar 2014 09:01:47 +1100 xfce4-indicator-plugin (2.3.1-0ubuntu1) trusty; urgency=medium * New upstream bugfix release. -- Jackson Doak Fri, 07 Mar 2014 08:16:25 +1100 xfce4-indicator-plugin (2.3.0-0ubuntu1) trusty; urgency=medium * New upstream release. LP: #1238997 * Bump required panel version -- Jackson Doak Sun, 16 Feb 2014 15:03:36 +1100 xfce4-indicator-plugin (2.2.0-0ubuntu1) trusty; urgency=low [ Unit 193 ] * Merge from Debian unreleased VCS. Remaining changes: - debian/control: Drop recommends on indicator-messages-gtk2, as it was removed from the archive. * b-dep on libindicator3-dev and libido3-0.1-dev [ Luke Yelavich ] * debian/control: Build-dep on xfce4-panel-dev >= 4.11.0~0.git20140209.86a1b73-0ubuntu1. -- Unit 193 Thu, 13 Feb 2014 16:07:50 -0500 xfce4-indicator-plugin (2.2.0-1) UNRELEASED; urgency=low [ Evgeni Golov ] * Correct Vcs-* URLs to point to anonscm.debian.org * Add Build-Depends on libgtk-3-dev (>= 3.6). * Tighten Build-Depends on libxfce4ui-2-dev and libxfce4util-dev. [ Yves-Alexis Perez ] * New upstream release. -- Yves-Alexis Perez Wed, 04 Dec 2013 07:48:32 +0100 xfce4-indicator-plugin (1.0.0-1) unstable; urgency=low * New upstream release. * debian/control: - add build-dep on libxfce4ui-1-dev. * debian/rules: - don't ship .la files. - ignore plugin for dh_makeshlibs, since it's a plugin. - use autotools-dev addon to update config.{guess,sub}. * debian/control: - add build-dep on dpkg-dev for including pkg-info.mk. - add build-dep on autotools-dev -- Yves-Alexis Perez Mon, 10 Jun 2013 22:22:42 +0200 xfce4-indicator-plugin (0.5.0-2ubuntu2) saucy; urgency=low * Use dh_autotools-dev to update config.{sub,guess} for AArch64. -- Matthias Klose Tue, 15 Oct 2013 22:55:45 +0200 xfce4-indicator-plugin (0.5.0-2ubuntu1) saucy; urgency=low * Merge from Debian unstable. Remaining changes: - debian/control: Drop recommends on indicator-messages-gtk2, as it was removed from the archive. - debian/patches/migrate-xfcerc-xfconf.patch: Handle the blacklist migration to Xfconf. -- Logan Rosen Sat, 25 May 2013 21:41:44 -0400 xfce4-indicator-plugin (0.5.0-2) unstable; urgency=low [ Lionel Le Folgoc ] * debian/control: drop b-dep on libxfcegui4-dev, unused. [ Yves-Alexis Perez ] * debian/control: - update standards version to 3.9.4. - drop useless versions in build-deps - drop dpkg-dev build-dep * debian/rules: - enable all hardening flags. [ Evgeni Golov ] * Update d/copyright to copyright-format/1.0 -- Yves-Alexis Perez Sat, 25 May 2013 19:48:16 +0200 xfce4-indicator-plugin (0.5.0-1ubuntu2) quantal; urgency=low * Drop recommends on indicator-messages-gtk2 since this package is no longer installable and will most likely be removed from the archive - update debian/control * Change Vcs-* entries to XS-Debian-Vcs-* - update debian/control -- Micah Gersten Mon, 10 Sep 2012 15:12:34 -0500 xfce4-indicator-plugin (0.5.0-1ubuntu1) quantal; urgency=low * debian/patches: - migrate-xfcerc-xfconf.patch: added, handle the blacklist migration to Xfconf. * debian/control: drop libxfcegui4-dev from b-deps, unused. -- Lionel Le Folgoc Wed, 23 May 2012 21:20:49 +0200 xfce4-indicator-plugin (0.5.0-1build1) quantal; urgency=low * No change rebuild against xfce4-panel 4.10. -- Lionel Le Folgoc Fri, 18 May 2012 23:14:53 +0200 xfce4-indicator-plugin (0.5.0-1) unstable; urgency=low [ Yves-Alexis Perez ] * New upstream release. * debian/rules: - build with --parallel. * debian/control: - update debhelper build-dep to 9. - add build-dep on exo and xfconf. - update standards version to 3.9.3. -- Evgeni Golov Sat, 05 May 2012 15:54:41 +0200 xfce4-indicator-plugin (0.4.0-1) unstable; urgency=low [ Evgeni Golov ] * Switch Recommends to indicator-messages-gtk2, we cannot use the GTK3 version provided by indicator-messages. [ Lionel Le Folgoc ] * New upstream release. - "Scrolling the mousewheel over the sound-indicator doesn't adjust the volume". lp: #879928 - "xfce4-indicator-plugin does not update output". lp: #852017 * debian/patches: - search-for-indicator-0.4-pc.patch, fix_menu_position.patch, attach_button_to_menu_right_at_the_beginning.patch: dropped, included upstream. - potfiles.patch: dropped, not needed anymore. [ Yves-Alexis Perez ] * debian/rules: - enable hardening flags. * debian/compat bumped to 9. * debian/control: - add build-dep on dpkg-dev 1.16.1 for hardening support. - update debhelper build-dep to 8.9.4 for hardening support. -- Evgeni Golov Sun, 19 Feb 2012 15:08:18 +0100 xfce4-indicator-plugin (0.3.1-3) experimental; urgency=low * Add search-for-indicator-0.4-pc.patch from Ubuntu, libindicator-dev moved the .pc file. * Build-Depend on libindicator-dev (>=0.3.90) * Bump debian/compat to 9 and Build-Depend on debhelper >= 8.9.0~ for new-style buildflags. Drop the old ones from debian/rules. -- Evgeni Golov Tue, 18 Oct 2011 16:15:17 +0200 xfce4-indicator-plugin (0.3.1-2) unstable; urgency=low * Add fix_menu_position.patch and attach_button_to_menu_right_at_the_beginning.patch as suggested by upstream. -- Evgeni Golov Sun, 04 Sep 2011 22:43:47 +0200 xfce4-indicator-plugin (0.3.1-1) unstable; urgency=low * New upstream release. + Supports transparent background LP:#778998 -- Evgeni Golov Fri, 15 Jul 2011 15:27:20 +0200 xfce4-indicator-plugin (0.2.1-1) unstable; urgency=low * New upstream release. -- Yves-Alexis Perez Fri, 06 May 2011 22:33:52 +0200 xfce4-indicator-plugin (0.2.0-2) unstable; urgency=low [ Lionel Le Folgoc ] * Upload to unstable. * debian/control: - add myself to Uploaders. - remove Simon and Emanuele from uploaders, thanks to them. - bump xfce4-panel-dev b-dep to (>= 4.8.0). [ Yves-Alexis Perez ] * debian/control: - update standards version to 3.9.2. -- Lionel Le Folgoc Tue, 19 Apr 2011 23:02:15 +0200 xfce4-indicator-plugin (0.2.0-1) experimental; urgency=low [ Yves-Alexis Perez ] * New upstream release. * debian/control: - add build-dep on hardening-includes - update standards version to 3.9.1. * debian/rules: - pick {C,LD}FLAGS from dpkg-buildflags - add -O1, --as-needed and -z,defs to LDFLAGS - add hardening flags to {C,LD}FLAGS * debian/watch updated. * debian/patches: - 01_libindicator0.3.0_compat dropped, included upstream. - 02_menu_on_no-indicators as well. - 03_skip_pofiles_in_patches removed, now useless. [ Evgeni Golov ] * debian/copyright: - Update years. - Add Yves-Alexis. - Fix upstream URL. -- Evgeni Golov Sun, 27 Feb 2011 14:44:16 +0100 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 Wed, 14 Jul 2010 09:35:08 +0200 xfce4-indicator-plugin (0.0.1-1) unstable; urgency=low * Initial release closes: #534555 -- Evgeni Golov Sun, 13 Jun 2010 17:14:30 +0200 debian/compat0000664000000000000000000000000212321362340010362 0ustar 9 debian/copyright0000664000000000000000000000116512321362340011122 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xfce4-indicator-plugin Upstream-Contact: Mark Trompell Source: http://archive.xfce.org/src/panel-plugins/xfce4-indicator-plugin/ Files: * Copyright: 2009-2012 Mark Trompell License: GPL-2+ Files: debian/* Copyright: 2009-2013 Evgeni Golov 2010-2013 Yves-Alexis Perez 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'. debian/source/0000775000000000000000000000000012321362430010464 5ustar debian/source/format0000664000000000000000000000001412321362340011672 0ustar 3.0 (quilt) debian/control0000664000000000000000000000233112321362340010566 0ustar Source: xfce4-indicator-plugin Section: xfce Priority: optional Maintainer: Xubuntu Developers XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Evgeni Golov , Lionel Le Folgoc Build-Depends: debhelper (>= 9), xfce4-panel-dev (>= 4.11.0), libindicator3-dev, libido3-0.1-dev, intltool, libexo-1-dev, libxfconf-0-dev, libxfce4ui-2-dev (>= 4.11), libxfce4util-dev (>= 4.9), dpkg-dev (>= 1.16.1~), autotools-dev, libgtk-3-dev (>= 3.6) Standards-Version: 3.9.4 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-indicator-plugin/ Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/ Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-xfce/goodies/trunk/xfce4-indicator-plugin/ Package: xfce4-indicator-plugin Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: indicator-renderer 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. debian/patches/0000775000000000000000000000000012321362430010613 5ustar debian/patches/series0000664000000000000000000000002612321362355012034 0ustar 01_upstart-init.patch debian/patches/01_upstart-init.patch0000664000000000000000000000351612321362355014612 0ustar Description: Start and stop indicator services with upstart Use upstart to start and stop indicator services instead of autostart *.desktop files. Origin: other, http://git.xfce.org/users/ajb/xfce4-indicator-plugin/commit/?h=upstart-init-3&id=baa04878aaf5f688f9e01507696e54062cc5dc55 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xfce4-indicator-plugin/+bug/1302571 --- --- a/panel-plugin/indicator.c +++ b/panel-plugin/indicator.c @@ -97,6 +97,9 @@ /* log file */ FILE *logfile; + + /* Indicator upstart process. */ + GPid upstart_pid; }; @@ -136,6 +139,7 @@ indicator->buttonbox = NULL; indicator->config = NULL; indicator->logfile = NULL; + indicator->upstart_pid = 0; } @@ -143,12 +147,19 @@ static void indicator_free (XfcePanelPlugin *plugin) { + IndicatorPlugin *indicator = XFCE_INDICATOR_PLUGIN (plugin); GtkWidget *dialog; /* check if the dialog is still open. if so, destroy it */ dialog = g_object_get_data (G_OBJECT (plugin), "dialog"); if (G_UNLIKELY (dialog != NULL)) gtk_widget_destroy (dialog); + + if (indicator->upstart_pid) + { + kill (indicator->upstart_pid, SIGTERM); + waitpid (indicator->upstart_pid, NULL, 0); + } } @@ -314,6 +325,15 @@ indicator_load_services (indicator); #endif + gchar *INDICATORS_CMD[] = {"init", "--user", "--startup-event", "indicator-services-start", NULL}; + GError *error = NULL; + + if (!g_spawn_async (NULL, INDICATORS_CMD, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &indicator->upstart_pid, &error)) + { + g_warning ("Error starting Upstart for indicators: %s", error->message); + g_clear_error (&error); + } + if (indicator->indicator_count == 0) { /* A label to allow for click through */ indicator->item = xfce_indicator_button_new (NULL,