r2003 - in /unstable/evolution/debian: changelog control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Sep 30 21:24:42 2011
New Revision: 2003

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2003
Log:
  - update dpkg-dev build-dep for hardening.
* debian/rules:
  - set hardening flags directly from cdbs

Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/control
    unstable/evolution/debian/rules

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=2003&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Fri Sep 30 21:24:42 2011
@@ -6,8 +6,11 @@
     - bump gtkhtml build-dep to 4.2.
     - drop build-dep and dep on libunique
     - add build-dep on gsettings-desktop-schemas-dev and libchamplain. 
-
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Sep 2011 23:22:40 +0200
+    - update dpkg-dev build-dep for hardening.
+  * debian/rules:
+    - set hardening flags directly from cdbs
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Sep 2011 23:23:57 +0200
 
 evolution (3.0.3-2) unstable; urgency=low
 

Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=2003&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Fri Sep 30 21:24:42 2011
@@ -17,7 +17,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution
 Build-Depends: debhelper (>= 7.2.3~),
                cdbs (>= 0.4.52),
-               dpkg-dev (>= 1.14.16),
+               dpkg-dev (>= 1.16.1),
                hardening-includes,
                libglib2.0-dev (>= 2.28),
                libgtk-3-dev (>= 3.0.2),

Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=2003&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Fri Sep 30 21:24:42 2011
@@ -16,12 +16,8 @@
 DEB_DH_MAKESHLIBS_ARGS_evolution += -V
 DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-CFLAGS += $(HARDENING_CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,-O1 -Wl,--as-needed $(HARDENING_LDFLAGS)
-
-export CFLAGS LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
 DEB_REVISION := $(shell echo $(DEB_VERSION) | awk -F- '{ print $$NF }')