[Pkg-xfce-commits] r5264 - in goodies/trunk/xfce4-datetime-plugin: . debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-04-02 15:58:01 +0000 (Sat, 02 Apr 2011)
New Revision: 5264

Modified:
   goodies/trunk/xfce4-datetime-plugin/
   goodies/trunk/xfce4-datetime-plugin/debian/changelog
   goodies/trunk/xfce4-datetime-plugin/debian/compat
   goodies/trunk/xfce4-datetime-plugin/debian/control
   goodies/trunk/xfce4-datetime-plugin/debian/rules
Log:
merge experimental branch into unstable



Property changes on: goodies/trunk/xfce4-datetime-plugin
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/xfce4-datetime-plugin:4300-5263

Modified: goodies/trunk/xfce4-datetime-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/changelog	2011-04-02 15:56:21 UTC (rev 5263)
+++ goodies/trunk/xfce4-datetime-plugin/debian/changelog	2011-04-02 15:58:01 UTC (rev 5264)
@@ -7,8 +7,17 @@
   * debian/watch edited to track Xfce archive reorganisation.
   * debian/control:
     - switch to xfce section.
+    - update standards version to 3.9.1.
+    - update debhelper build dep to 7.0.50~ for overrides.
+    - add build-dep on hardening-includes
+  * debian/rules:
+    - switch to dh7 rules with overrides.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add -Wl,-z,defs -Wl,--as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
+  * debian/compat switched to 7.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 19 Jun 2010 13:15:11 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 17 Oct 2010 22:48:50 +0200
 
 xfce4-datetime-plugin (0.6.1-1) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-datetime-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/compat	2011-04-02 15:56:21 UTC (rev 5263)
+++ goodies/trunk/xfce4-datetime-plugin/debian/compat	2011-04-02 15:58:01 UTC (rev 5264)
@@ -1 +1 @@
-4
+7

Modified: goodies/trunk/xfce4-datetime-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/control	2011-04-02 15:56:21 UTC (rev 5263)
+++ goodies/trunk/xfce4-datetime-plugin/debian/control	2011-04-02 15:58:01 UTC (rev 5264)
@@ -4,8 +4,10 @@
 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, intltool, cdbs, debhelper (>= 4.1), libgtk2.0-dev, libxfcegui4-dev (>= 4.4.0), xfce4-panel-dev (>= 4.4.0), libxml2-dev, libxml-parser-perl
-Standards-Version: 3.8.0
+Build-Depends: autotools-dev, intltool, cdbs, debhelper (>= 7.0.50~),
+ libgtk2.0-dev, libxfcegui4-dev (>= 4.4.0), xfce4-panel-dev (>= 4.4.0),
+ libxml2-dev, libxml-parser-perl, hardening-includes
+Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-datetime-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-datetime-plugin/

Modified: goodies/trunk/xfce4-datetime-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/rules	2011-04-02 15:56:21 UTC (rev 5263)
+++ goodies/trunk/xfce4-datetime-plugin/debian/rules	2011-04-02 15:58:01 UTC (rev 5264)
@@ -1,8 +1,18 @@
 #!/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
-						
-binary-post-install/xfce4-datetime-plugin::
+
+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 $@
+
+override_dh_auto_install:
 	-rm -rf debian/xfce4-datetime-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-datetime-plugin/usr/lib/xfce4/panel-plugins/*.la
+	dh_auto_install