[Pkg-xfce-commits] r5275 - in goodies/trunk/xfce4-genmon-plugin: . debian debian/patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sat Apr 2 07:32:39 UTC 2011
Author: mrpouit-guest
Date: 2011-04-02 19:32:37 +0000 (Sat, 02 Apr 2011)
New Revision: 5275
Added:
goodies/trunk/xfce4-genmon-plugin/debian/source/
Removed:
goodies/trunk/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch
goodies/trunk/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch
Modified:
goodies/trunk/xfce4-genmon-plugin/
goodies/trunk/xfce4-genmon-plugin/debian/changelog
goodies/trunk/xfce4-genmon-plugin/debian/compat
goodies/trunk/xfce4-genmon-plugin/debian/control
goodies/trunk/xfce4-genmon-plugin/debian/rules
Log:
merge experimental changes into trunk
Property changes on: goodies/trunk/xfce4-genmon-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-genmon-plugin:4344-5273
Modified: goodies/trunk/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/changelog 2011-04-02 19:32:03 UTC (rev 5274)
+++ goodies/trunk/xfce4-genmon-plugin/debian/changelog 2011-04-02 19:32:37 UTC (rev 5275)
@@ -1,15 +1,37 @@
-xfce4-genmon-plugin (3.2-4) UNRELEASED; urgency=low
+xfce4-genmon-plugin (3.3.0-1) UNRELEASED; urgency=low
[ Evgeni Golov ]
* Fix Vcs-* fields, they were missing 'trunk' in the path.
[ Yves-Alexis Perez ]
+ * New upstream release.
* debian/watch edited to track Xfce archive reorganisation.
* debian/control:
- switch to xfce section.
+ - add build-dep on libxfcegui4-dev.
+ - update standards version to 3.9.1.
+ - add ${misc:Depends} to dependencies.
+ - update debhelper build-dep for overrides support.
+ - drop cdbs build-dep.
+ - add build-dep on hardening-includes.
+ * debian/patches:
+ - 01_no-zombies dropped, included upstream.
+ - 02_close-unused-pipes as well.
+ * debian/rules:
+ - drop simple-patchsys include.
+ - pick build flags from dpkg-buildflags.
+ - add -z,defs, --as-needed and -O1 to LDFLAGS.
+ - add hardening flags to build flags.
+ - switch to debhelper 7 tiny.rules with overrides.
+ * Switch to 3.0 (quilt) source format
+ * debian/compat bumped to 7.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 19 Jun 2010 13:15:52 +0200
+ [ Lionel Le Folgoc ]
+ * Upload to unstable.
+ * debian/control: add myself to Uploaders.
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 04 Nov 2010 13:18:33 +0100
+
xfce4-genmon-plugin (3.2-3) unstable; urgency=low
* debian/patches: 02_close-unused-pipes added, don't hang on non-finishing
Modified: goodies/trunk/xfce4-genmon-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/compat 2011-04-02 19:32:03 UTC (rev 5274)
+++ goodies/trunk/xfce4-genmon-plugin/debian/compat 2011-04-02 19:32:37 UTC (rev 5275)
@@ -1 +1 @@
-4
+7
Modified: goodies/trunk/xfce4-genmon-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/control 2011-04-02 19:32:03 UTC (rev 5274)
+++ goodies/trunk/xfce4-genmon-plugin/debian/control 2011-04-02 19:32:37 UTC (rev 5275)
@@ -2,16 +2,18 @@
Section: xfce
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
-Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 4.1.0), autotools-dev, cdbs, xfce4-panel-dev (>= 4.4.1), libxml-parser-perl
-Standards-Version: 3.8.0
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, xfce4-panel-dev (>= 4.4.1),
+ libxml-parser-perl, libxfcegui4-dev, intltool, hardening-includes
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-genmon-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-genmon-plugin/
Package: xfce4-genmon-plugin
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Generic Monitor for the Xfce4 panel
This plugin repeatedly spawns the indicated script/program, displaying
its output as a string in the panel. It is useful for periodic status
Deleted: goodies/trunk/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch 2011-04-02 19:32:03 UTC (rev 5274)
+++ goodies/trunk/xfce4-genmon-plugin/debian/patches/01_no-zombies.patch 2011-04-02 19:32:37 UTC (rev 5275)
@@ -1,33 +0,0 @@
-diff -u a/main.c b/main.c
---- a/panel-plugin/main.c 2008-03-15 15:38:18.000000000 -0700
-+++ b/panel-plugin/main.c 2008-04-16 12:46:22.000000000 -0700
-@@ -32,6 +32,7 @@
-
- #include <libxfce4util/libxfce4util.h>
- #include <libxfcegui4/dialogs.h>
-+#include <libxfcegui4/xfce-exec.h>
- #include <libxfce4panel/xfce-panel-plugin.h>
- #include <libxfce4panel/xfce-panel-convenience.h>
-
-@@ -94,10 +95,18 @@
- {
- struct genmon_t *poPlugin = (genmon_t *) p_pvPlugin;
- struct monitor_t *poMonitor = &(poPlugin->oMonitor);
-- char result[256];
-+ GError *error = NULL;
-+
-+ xfce_exec(poMonitor->onClickCmd, 0, 0, &error);
-+ if (error) {
-+ char first[256];
-+ g_snprintf (first, sizeof(first), _("Could not run \"%s\""), poMonitor->onClickCmd);
-+ xfce_message_dialog (NULL, _("Xfce Panel"),
-+ GTK_STOCK_DIALOG_ERROR, first, error->message,
-+ GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL);
-+ g_error_free (error);
-+ }
-
-- genmon_SpawnCmd (poMonitor->onClickCmd, result,
-- sizeof (poMonitor->onClickCmd), 0);
- }
-
- /**************************************************************/
Deleted: goodies/trunk/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch 2011-04-02 19:32:03 UTC (rev 5274)
+++ goodies/trunk/xfce4-genmon-plugin/debian/patches/02_close-unused-pipes.patch 2011-04-02 19:32:37 UTC (rev 5275)
@@ -1,33 +0,0 @@
---- xfce4-genmon-plugin-3.2.orig/panel-plugin/cmdspawn.c 2007-11-23 07:32:40.000000000 -0800
-+++ xfce4-genmon-plugin-3.2.new2/panel-plugin/cmdspawn.c 2008-04-28 21:18:28.000000000 -0700
-@@ -184,6 +184,7 @@
- return (-1);
- case 0:
- /* Redirect stdout/stderr to associated pipe's write-ends */
-+ close(0); /* stdin is not used in child */
- for (i = 0; i < OUT_ERR; i++) {
- j = i + 1; // stdout/stderr file descriptor
- close (j);
-@@ -199,6 +200,9 @@
- exit (-1);
- }
-
-+ for (i = 0; i < OUT_ERR; i++)
-+ close (aaiPipe[i][WR]); /* close write end of pipes in parent */
-+
- /* Wait for child completion */
- if (wait == 1)
- {
-@@ -231,10 +235,9 @@
- }
-
- End:
-- /* Close created pipes */
-+ /* Close read end of pipes */
- for (i = 0; i < OUT_ERR; i++)
-- for (j = 0; j < RD_WR; j++)
-- close (aaiPipe[i][j]);
-+ close (aaiPipe[i][RD]);
-
- return (-fError);
- }// Spawn()
Modified: goodies/trunk/xfce4-genmon-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-genmon-plugin/debian/rules 2011-04-02 19:32:03 UTC (rev 5274)
+++ goodies/trunk/xfce4-genmon-plugin/debian/rules 2011-04-02 19:32:37 UTC (rev 5275)
@@ -1,8 +1,17 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
-binary-post-install/xfce4-genmon-plugin::
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
+
+export CFLAGS LDFLAGS
+
+override_dh_install:
+ rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
+ rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+ dh_install
+
+%:
+ dh $@
More information about the Pkg-xfce-commits
mailing list