[Pkg-xfce-commits] r5270 - in goodies/trunk/xfce4-diskperf-plugin: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-02 17:35:00 +0000 (Sat, 02 Apr 2011)
New Revision: 5270

Added:
   goodies/trunk/xfce4-diskperf-plugin/debian/patches/
   goodies/trunk/xfce4-diskperf-plugin/debian/source/
Modified:
   goodies/trunk/xfce4-diskperf-plugin/
   goodies/trunk/xfce4-diskperf-plugin/debian/changelog
   goodies/trunk/xfce4-diskperf-plugin/debian/control
   goodies/trunk/xfce4-diskperf-plugin/debian/rules
Log:
merge experimental branch into trunk



Property changes on: goodies/trunk/xfce4-diskperf-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-diskperf-plugin:4344-5269
/goodies/tags/xfce4-diskperf-plugin/2.2.0-3:3875-4343

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/changelog	2011-04-02 16:04:17 UTC (rev 5269)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/changelog	2011-04-02 17:35:00 UTC (rev 5270)
@@ -1,10 +1,26 @@
-xfce4-diskperf-plugin (2.2.0-4) UNRELEASED; urgency=low
+xfce4-diskperf-plugin (2.3.0-1) experimental; urgency=low
 
+  [ Yves-Alexis Perez ]
+  * New upstream release.
   * debian/control:
-    - add sh4 to supported architectures.                       closes: #571295
+    - add build-dep on libxfcegui4-dev now that it's gone from
+      xfce4-panel-dev dependencies.
+    - update standards version to 3.9.1.
+    - update debhelper build-dep to 7.0.50~ for overrides.
+    - switch to linux-any architectures.                        closes: #604681
+  * Switch to 3.0 (quilt) source format.
+  * debian/rules:
+    - switch to dh7 tiny rules.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
+    - add -z,defs, --as-needed and -O1 to LFDLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 25 Feb 2010 08:14:30 +0100
+  [ Lionel Le Folgoc ]
+  * debian/rules: clean up autogenerated files changed by xdt-autogen.
+  * debian/control: add myself to Uploaders.
 
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 27 Feb 2011 00:57:28 +0100
+
 xfce4-diskperf-plugin (2.2.0-3) unstable; urgency=low
 
   * debian/control:

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/control	2011-04-02 16:04:17 UTC (rev 5269)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/control	2011-04-02 17:35:00 UTC (rev 5270)
@@ -2,16 +2,19 @@
 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>, Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>, 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.4
+Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
+ Rudy Godoy <rudy at kernel-panik.org>, Martin Loschwitz <madkiss at debian.org>,
+ Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
+Build-Depends: autotools-dev, cdbs, debhelper (>= 7.0.50~), xfce4-panel-dev, 
+ libxml2-dev, libxml-parser-perl, libxfcegui4-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-diskperf-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-diskperf-plugin/
 
 Package: xfce4-diskperf-plugin
-Architecture: alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc sh4
+Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: disk performance display plugin for the Xfce4 panel
  The DiskPerf plugin displays disk/partition performance statistics based on

Modified: goodies/trunk/xfce4-diskperf-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-diskperf-plugin/debian/rules	2011-04-02 16:04:17 UTC (rev 5269)
+++ goodies/trunk/xfce4-diskperf-plugin/debian/rules	2011-04-02 17:35:00 UTC (rev 5270)
@@ -1,7 +1,17 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
-binary-post-install/xfce4-diskperf-plugin::
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS+=$(HARDENING_CFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed -Wl,-O1 $(HARDENING_LDFLAGS)
+
+export CFLAGS LDFLAGS
+
+%:
+	dh $@
+
+override_dh_auto_install:
 	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-diskperf-plugin/usr/lib/xfce4/panel-plugins/*.la
+	dh_auto_install