[Pkg-xfce-commits] r4755 - desktop/trunk/xfce4-dev-tools/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-01-02 14:29:03 +0000 (Sun, 02 Jan 2011)
New Revision: 4755

Modified:
   desktop/trunk/xfce4-dev-tools/debian/changelog
   desktop/trunk/xfce4-dev-tools/debian/control
   desktop/trunk/xfce4-dev-tools/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/rules:
  - switch to dh7 tiny rules.
  - pick {C,LD}FLAGS from dpkg-buildflags.
  - add hardening flags to {C,LD}FLAGS.
  - add -z,defs, -O1, --as-needed to LDFLAGS

Modified: desktop/trunk/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/changelog	2011-01-02 14:19:15 UTC (rev 4754)
+++ desktop/trunk/xfce4-dev-tools/debian/changelog	2011-01-02 14:29:03 UTC (rev 4755)
@@ -9,8 +9,14 @@
   * Switch to 3.0 (quilt) source format.
   * debian/control:
     - update standards version to 3.9.1.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - switch to dh7 tiny rules.
+    - pick {C,LD}FLAGS from dpkg-buildflags.
+    - add hardening flags to {C,LD}FLAGS.
+    - add -z,defs, -O1, --as-needed to LDFLAGS
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 15:19:01 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 02 Jan 2011 15:20:40 +0100
 
 xfce4-dev-tools (4.7.2-3) unstable; urgency=low
 

Modified: desktop/trunk/xfce4-dev-tools/debian/control
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/control	2011-01-02 14:19:15 UTC (rev 4754)
+++ desktop/trunk/xfce4-dev-tools/debian/control	2011-01-02 14:29:03 UTC (rev 4755)
@@ -4,7 +4,7 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>,
  Simon Huggins <huggie at earth.li>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs
+Build-Depends: debhelper (>= 7), autotools-dev, hardening-includes
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-dev-tools/

Modified: desktop/trunk/xfce4-dev-tools/debian/rules
===================================================================
--- desktop/trunk/xfce4-dev-tools/debian/rules	2011-01-02 14:19:15 UTC (rev 4754)
+++ desktop/trunk/xfce4-dev-tools/debian/rules	2011-01-02 14:29:03 UTC (rev 4755)
@@ -1,7 +1,13 @@
 #!/usr/bin/make -f
+include /usr/share/hardening-includes/hardening.make
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
+CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed
+CFLAGS+=$(HARDENING_CFLAGS)
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-final
+export CFLAGS LDFLAGS
+
+
+%:
+	dh $@