r1989 - in /unstable/gtkhtml4.0/debian: changelog compat control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Fri Sep 30 19:46:04 2011
New Revision: 1989

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1989
Log:
  - update debhelper build-dep to 8.9.4 for hardening flags support.
  - drop build-dep on hardening-includes.
* debian/rules:
  - remove hardening include
  - switch hardening flags setting to the dh9 way.
* debian/compat bumped to 9.

Modified:
    unstable/gtkhtml4.0/debian/changelog
    unstable/gtkhtml4.0/debian/compat
    unstable/gtkhtml4.0/debian/control
    unstable/gtkhtml4.0/debian/rules

Modified: unstable/gtkhtml4.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/changelog?rev=1989&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/changelog (original)
+++ unstable/gtkhtml4.0/debian/changelog Fri Sep 30 19:46:04 2011
@@ -4,8 +4,14 @@
   * debian/control:
     - replace gconf build-dep by gsettings-desktop-schemas-dev.
     - update gladeui build-dep.
-
- -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Sep 2011 21:04:27 +0200
+    - update debhelper build-dep to 8.9.4 for hardening flags support.
+    - drop build-dep on hardening-includes.
+  * debian/rules:
+    - remove hardening include
+    - switch hardening flags setting to the dh9 way.
+  * debian/compat bumped to 9.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 30 Sep 2011 21:42:37 +0200
 
 gtkhtml4.0 (4.0.2-1) unstable; urgency=low
 

Modified: unstable/gtkhtml4.0/debian/compat
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/compat?rev=1989&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/compat (original)
+++ unstable/gtkhtml4.0/debian/compat Fri Sep 30 19:46:04 2011
@@ -1,1 +1,1 @@
-5
+9

Modified: unstable/gtkhtml4.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/control?rev=1989&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/control (original)
+++ unstable/gtkhtml4.0/debian/control Fri Sep 30 19:46:04 2011
@@ -13,10 +13,9 @@
 Homepage: http://www.gnome.org/projects/evolution/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/experimental/gtkhtml4.0
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/experimental/gtkhtml4.0
-Build-Depends: debhelper (>= 7.2.3~),
+Build-Depends: debhelper (>= 8.9.4),
                cdbs (>= 0.4.37),
                dpkg-dev (>= 1.14.16),
-               hardening-includes,
                pkg-config,
                libtool,
                libgtk-3-dev (>= 3.0.2),

Modified: unstable/gtkhtml4.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/gtkhtml4.0/debian/rules?rev=1989&op=diff
==============================================================================
--- unstable/gtkhtml4.0/debian/rules (original)
+++ unstable/gtkhtml4.0/debian/rules Fri Sep 30 19:46:04 2011
@@ -4,16 +4,11 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-include /usr/share/hardening-includes/hardening.make
 
 GNOME_MODULE := gtkhtml
 
-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 CFLAGS LDFLAGS
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-static