[Pkg-xfce-commits] r7573 - goodies/trunk/xfce4-dict/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-05-23 21:41:13 +0000 (Thu, 23 May 2013)
New Revision: 7573

Modified:
   goodies/trunk/xfce4-dict/debian/changelog
   goodies/trunk/xfce4-dict/debian/control
   goodies/trunk/xfce4-dict/debian/rules
Log:
* debian/rules:
  - switch to debhelper/dpkg hardening support.
* debian/control:
  - drop build-dep on hardening-includes.
  - update debhelper build-dep to 9.

Modified: goodies/trunk/xfce4-dict/debian/changelog
===================================================================
--- goodies/trunk/xfce4-dict/debian/changelog	2013-05-23 21:40:08 UTC (rev 7572)
+++ goodies/trunk/xfce4-dict/debian/changelog	2013-05-23 21:41:13 UTC (rev 7573)
@@ -1,6 +1,11 @@
 xfce4-dict (0.7.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/rules:
+    - switch to debhelper/dpkg hardening support.
+  * debian/control:
+    - drop build-dep on hardening-includes.
+    - update debhelper build-dep to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 23 May 2013 23:40:01 +0200
 

Modified: goodies/trunk/xfce4-dict/debian/control
===================================================================
--- goodies/trunk/xfce4-dict/debian/control	2013-05-23 21:40:08 UTC (rev 7572)
+++ goodies/trunk/xfce4-dict/debian/control	2013-05-23 21:41:13 UTC (rev 7573)
@@ -3,9 +3,8 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 7.0.13), xfce4-panel-dev (>= 4.8.0),
- libxml-parser-perl, intltool, libgtk2.0-dev, libxfcegui4-dev (>= 4.8.0),
- hardening-includes
+Build-Depends: debhelper (>= 9), xfce4-panel-dev (>= 4.8.0),
+ libxml-parser-perl, intltool, libgtk2.0-dev, libxfcegui4-dev (>= 4.8.0)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-dict/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-dict/

Modified: goodies/trunk/xfce4-dict/debian/rules
===================================================================
--- goodies/trunk/xfce4-dict/debian/rules	2013-05-23 21:40:08 UTC (rev 7572)
+++ goodies/trunk/xfce4-dict/debian/rules	2013-05-23 21:41:13 UTC (rev 7573)
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 %:
 	dh $@