[Pkg-xfce-commits] r7648 - goodies/trunk/xfce4-notes-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-25 14:43:34 +0000 (Sat, 25 May 2013)
New Revision: 7648

Modified:
   goodies/trunk/xfce4-notes-plugin/debian/changelog
   goodies/trunk/xfce4-notes-plugin/debian/rules
Log:
use dpkg/debhelper hardening support. 

Modified: goodies/trunk/xfce4-notes-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/changelog	2013-05-25 14:42:59 UTC (rev 7647)
+++ goodies/trunk/xfce4-notes-plugin/debian/changelog	2013-05-25 14:43:34 UTC (rev 7648)
@@ -7,6 +7,7 @@
     - drop build-dep on hardening-includes. 
   * debian/rules:
     - enable parallel build.
+    - use dpkg/debhelper hardening support. 
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 25 May 2013 16:40:24 +0200
 

Modified: goodies/trunk/xfce4-notes-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-notes-plugin/debian/rules	2013-05-25 14:42:59 UTC (rev 7647)
+++ goodies/trunk/xfce4-notes-plugin/debian/rules	2013-05-25 14:43:34 UTC (rev 7648)
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
-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 DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-export CFLAGS LDFLAGS
-
 override_dh_install:
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/tmp/usr/lib/xfce4/panel-plugins/*.la