[Pkg-xfce-commits] r5261 - in goodies/trunk/xfce4-cpugraph-plugin: . debian
Yves-Alexis Perez
corsac at alioth.debian.org
Sat Apr 2 03:55:03 UTC 2011
Author: corsac
Date: 2011-04-02 15:55:01 +0000 (Sat, 02 Apr 2011)
New Revision: 5261
Added:
goodies/trunk/xfce4-cpugraph-plugin/debian/source/
Modified:
goodies/trunk/xfce4-cpugraph-plugin/
goodies/trunk/xfce4-cpugraph-plugin/debian/changelog
goodies/trunk/xfce4-cpugraph-plugin/debian/control
goodies/trunk/xfce4-cpugraph-plugin/debian/copyright
goodies/trunk/xfce4-cpugraph-plugin/debian/rules
Log:
merge experimental branch into trunk
Property changes on: goodies/trunk/xfce4-cpugraph-plugin
___________________________________________________________________
Added: svn:mergeinfo
+ /goodies/branches/experimental/xfce4-cpugraph-plugin:4297-5260
Modified: goodies/trunk/xfce4-cpugraph-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-cpugraph-plugin/debian/changelog 2011-04-02 15:52:27 UTC (rev 5260)
+++ goodies/trunk/xfce4-cpugraph-plugin/debian/changelog 2011-04-02 15:55:01 UTC (rev 5261)
@@ -1,10 +1,28 @@
-xfce4-cpugraph-plugin (0.4.0-3) UNRELEASED; urgency=low
+xfce4-cpugraph-plugin (1.0.1-1) experimental; urgency=low
+ [ Yves-Alexis Perez ]
* debian/control:
- switch to xfce section.
+ - add build-dep on hardening-includes.
+ * debian/rules:
+ - pick {C,LD}FLAGS from dpkg-buildflags.
+ - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+ - add hardening flags to {C,LD}FLAGS.
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 09 Jan 2010 17:02:21 +0100
+ [ Lionel Le Folgoc ]
+ * New upstream release.
+ - readd option to hide/deactivate the cpu graph bars lp: #362336
+ - do not hardcode "xterm top" closes: #568927
+ * Switch to 3.0 (quilt).
+ * debian/rules: switch to dh7.
+ * debian/control:
+ - add myself to Uploaders
+ - refreshed build-deps
+ - bumped Standards-Version to 3.9.1.
+ * debian/copyright: refreshed.
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 27 Feb 2011 14:36:13 +0100
+
xfce4-cpugraph-plugin (0.4.0-2) unstable; urgency=low
[ Evgeni Golov ]
Modified: goodies/trunk/xfce4-cpugraph-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-cpugraph-plugin/debian/control 2011-04-02 15:52:27 UTC (rev 5260)
+++ goodies/trunk/xfce4-cpugraph-plugin/debian/control 2011-04-02 15:55:01 UTC (rev 5261)
@@ -2,11 +2,11 @@
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: autotools-dev, cdbs, debhelper (>= 7), xfce4-panel-dev,
- libxml2-dev, libxml-parser-perl
-Standards-Version: 3.8.3
+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), libxfcegui4-dev, xfce4-panel-dev, intltool,
+ hardening-includes
+Standards-Version: 3.9.1
Homepage: http://goodies.xfce.org/
Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-cpugraph-plugin/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-cpugraph-plugin/
Modified: goodies/trunk/xfce4-cpugraph-plugin/debian/copyright
===================================================================
--- goodies/trunk/xfce4-cpugraph-plugin/debian/copyright 2011-04-02 15:52:27 UTC (rev 5260)
+++ goodies/trunk/xfce4-cpugraph-plugin/debian/copyright 2011-04-02 15:55:01 UTC (rev 5261)
@@ -1,32 +1,27 @@
-This package was debianized by Rudy Godoy <rudy at kernel-panik.org> on
-Tue, 01 Feb 2005 12:16:12 -0500.
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: Graphical representation of the CPU load
+Source: http://archive.xfce.org/src/panel-plugins/xfce4-cpugraph-plugin/
-It was downloaded from <http://download.berlios.de/xfce-goodies/>
+Files: *
+Copyright: © Alexander Nordfelth <alex.nordfelth at telia.com>
+ © gatopeich <gatoguan-os at yahoo.com>
+ © 2007-2008 Angelo Miguel Arrifano <miknix at gmail.com>
+ © 2007-2008 lidiriel <lidiriel at coriolys.org>
+ © 2010 Florian Rivoal <frivoal at gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-Upstream Authors:
- © Alexander Nordfelth <alex.nordfelth at telia.com>
- © gatopeich <gatoguan-os at yahoo.com>
- © 2007-2008 lidiriel <lidiriel at coriolys.org>
- © 2007-2008 Angelo Miguel Arrifano <miknix at gmail.com>
-
-Copyright:
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ On Debian systems the full text of the GNU General Public License can be found
+ in the `/usr/share/common-licenses/GPL' file.
Modified: goodies/trunk/xfce4-cpugraph-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-cpugraph-plugin/debian/rules 2011-04-02 15:52:27 UTC (rev 5260)
+++ goodies/trunk/xfce4-cpugraph-plugin/debian/rules 2011-04-02 15:55:01 UTC (rev 5261)
@@ -1,7 +1,13 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-binary-post-install/xfce4-cpugraph-plugin::
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
- -rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+include /usr/share/hardening-includes/hardening.make
+
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed $(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
+%:
+ dh $@
More information about the Pkg-xfce-commits
mailing list