[Pkg-xfce-commits] r5322 - in goodies/trunk/xfce4-systemload-plugin: . debian debian/patches
Lionel Le Folgoc
mrpouit-guest at alioth.debian.org
Sun Apr 3 12:45:17 UTC 2011
Author: mrpouit-guest
Date: 2011-04-03 12:45:11 +0000 (Sun, 03 Apr 2011)
New Revision: 5322
Added:
goodies/trunk/xfce4-systemload-plugin/debian/source/
Removed:
goodies/trunk/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch
Modified:
goodies/trunk/xfce4-systemload-plugin/
goodies/trunk/xfce4-systemload-plugin/debian/changelog
goodies/trunk/xfce4-systemload-plugin/debian/control
goodies/trunk/xfce4-systemload-plugin/debian/rules
Log:
merge experimental changes into trunk
Property changes on: goodies/trunk/xfce4-systemload-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-systemload-plugin:4344-5321
/goodies/tags/xfce4-systemload-plugin/0.4.2-3:3174-4343
Modified: goodies/trunk/xfce4-systemload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/changelog 2011-04-03 12:41:37 UTC (rev 5321)
+++ goodies/trunk/xfce4-systemload-plugin/debian/changelog 2011-04-03 12:45:11 UTC (rev 5322)
@@ -1,12 +1,26 @@
-xfce4-systemload-plugin (0.4.2-4) UNRELEASED; urgency=low
+xfce4-systemload-plugin (1.0.0-1) UNRELEASED; urgency=low
[ Evgeni Golov ]
* Fix Vcs-* fields, they were missing 'trunk' in the path.
[ Yves-Alexis Perez ]
- * debian/watch edited to track Xfce archive reorganisation.
+ * New upstream release.
+ * debian/control:
+ - add build-dep on libxfcegui4-dev.
+ - update standards version to 3.9.1.
+ - add build-dep on hardening-includes.
+ - add build-dep on intltool.
+ * Switch to 3.0 (quilt) source format.
+ * debian/rules:
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -O1, -z,defs and --as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS.
+ * debian/watch edited to track Xfce archive reorganisation
+ * debian/patches:
+ - 01_fix-ftbfs-kfreebsd dropped, included upstream.
+ - 02_fix-tooltip-gtk2.12 dropped as well.
- -- Yves-Alexis Perez <corsac at debian.org> Mon, 03 Aug 2009 18:32:53 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Fri, 10 Dec 2010 08:05:40 +0100
xfce4-systemload-plugin (0.4.2-3) unstable; urgency=low
Modified: goodies/trunk/xfce4-systemload-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/control 2011-04-03 12:41:37 UTC (rev 5321)
+++ goodies/trunk/xfce4-systemload-plugin/debian/control 2011-04-03 12:45:11 UTC (rev 5322)
@@ -5,8 +5,9 @@
Uploaders: Emanuele Rocca <ema at debian.org>,
Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: autotools-dev, cdbs, debhelper (>= 7),
- xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl
-Standards-Version: 3.8.1
+ xfce4-panel-dev (>= 4.6.0), libxml2-dev, libxml-parser-perl, libxfcegui4-dev,
+ hardening-includes, intltool
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/
Deleted: goodies/trunk/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch 2011-04-03 12:41:37 UTC (rev 5321)
+++ goodies/trunk/xfce4-systemload-plugin/debian/patches/01_fix-ftbfs-kfreebsd.patch 2011-04-03 12:45:11 UTC (rev 5322)
@@ -1,33 +0,0 @@
---- xfce4-systemload-plugin-0.4/panel-plugin/cpu.c 2007-03-10 00:02:05.997544000 +0100
-+++ xfce4-systemload-plugin-0.4/panel-plugin/cpu.c 2007-03-10 00:02:27.000000000 +0100
-@@ -37,7 +37,7 @@
- #include <libxfcegui4/dialogs.h>
- #include "cpu.h"
-
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- #define PROC_STAT "/proc/stat"
-
- /* user, nice, system, interrupt(BSD specific), idle */
---- xfce4-systemload-plugin-0.4/panel-plugin/memswap.c 2007-03-10 00:01:41.904882000 +0100
-+++ xfce4-systemload-plugin-0.4/panel-plugin/memswap.c 2007-03-10 00:01:55.000000000 +0100
-@@ -32,7 +32,7 @@
- #include "memswap.h"
-
-
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
---- xfce4-systemload-plugin-0.4/panel-plugin/uptime.c 2007-03-10 00:03:36.023726000 +0100
-+++ xfce4-systemload-plugin-0.4/panel-plugin/uptime.c 2007-03-10 00:03:56.000000000 +0100
-@@ -34,7 +34,7 @@
-
- #include "uptime.h"
-
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
Deleted: goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch 2011-04-03 12:41:37 UTC (rev 5321)
+++ goodies/trunk/xfce4-systemload-plugin/debian/patches/02_fix-tooltip-gtk2.12.patch 2011-04-03 12:45:11 UTC (rev 5322)
@@ -1,23 +0,0 @@
-diff --git a/panel-plugin/systemload.c b/panel-plugin/systemload.c
-index cc96ec4..027e8fe 100644
---- a/panel-plugin/systemload.c
-+++ b/panel-plugin/systemload.c
-@@ -315,11 +315,18 @@ monitor_control_new(XfcePanelPlugin *plugin)
- {
- int count;
- t_global_monitor *global;
-+ GtkSettings *settings;
-
- tooltips = gtk_tooltips_new ();
- g_object_ref (tooltips);
- gtk_object_sink (GTK_OBJECT (tooltips));
-
-+ /* reduce the default tooltip timeout to be smaller than the update
-+ * interval otherwise we won't see tooltips on GTK 2.16 or newer */
-+ settings = gtk_settings_get_default();
-+ if (g_object_class_find_property(G_OBJECT_GET_CLASS(settings), "gtk-tooltip-timeout"))
-+ g_object_set(settings, "gtk-tooltip-timeout", UPDATE_TIMEOUT - 10, NULL);
-+
- global = g_new(t_global_monitor, 1);
- global->plugin = plugin;
- global->timeout_id = 0;
Modified: goodies/trunk/xfce4-systemload-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/rules 2011-04-03 12:41:37 UTC (rev 5321)
+++ goodies/trunk/xfce4-systemload-plugin/debian/rules 2011-04-03 12:45:11 UTC (rev 5322)
@@ -1,8 +1,15 @@
#!/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
+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
+
DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug=yes
binary-post-install/xfce4-systemload-plugin::
More information about the Pkg-xfce-commits
mailing list