[Pkg-xfce-commits] r6645 - goodies/trunk/xfce4-hdaps/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-08 12:24:22 +0000 (Sun, 08 Apr 2012)
New Revision: 6645

Modified:
   goodies/trunk/xfce4-hdaps/debian/changelog
   goodies/trunk/xfce4-hdaps/debian/compat
   goodies/trunk/xfce4-hdaps/debian/control
   goodies/trunk/xfce4-hdaps/debian/rules
Log:
  - add build-dep on dh-autoreconf.
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop build-dep on hardening-includes.
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
* debian/compat bumped to 9. 

Modified: goodies/trunk/xfce4-hdaps/debian/changelog
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/changelog	2012-04-08 12:20:51 UTC (rev 6644)
+++ goodies/trunk/xfce4-hdaps/debian/changelog	2012-04-08 12:24:22 UTC (rev 6645)
@@ -5,11 +5,16 @@
   * Switch to 3.0 (quilt) source format.
   * debian/control:
     - add build-dep on xfce4-dev-tools and libtool.
-    - add build-dep on dh-autoreconf
+    - add build-dep on dh-autoreconf.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop build-dep on hardening-includes.
   * debian/rules:
     - run xdt-autogen before configure because hdaps was built with a broken
       intltool.
     - use autoreconf dh addon too.
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+  * debian/compat bumped to 9. 
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 08 Apr 2012 13:53:42 +0200
 

Modified: goodies/trunk/xfce4-hdaps/debian/compat
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/compat	2012-04-08 12:20:51 UTC (rev 6644)
+++ goodies/trunk/xfce4-hdaps/debian/compat	2012-04-08 12:24:22 UTC (rev 6645)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-hdaps/debian/control
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/control	2012-04-08 12:20:51 UTC (rev 6644)
+++ goodies/trunk/xfce4-hdaps/debian/control	2012-04-08 12:24:22 UTC (rev 6645)
@@ -5,9 +5,9 @@
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, 
  Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, 
  Evgeni Golov <evgeni at debian.org>
-Build-Depends: debhelper (>= 7), intltool, libxfce4util-dev, libxfce4ui-1-dev, 
- xfce4-panel-dev (>= 4.8.0), hardening-includes, xfce4-dev-tools, libtool,
- dh-autoreconf
+Build-Depends: debhelper (>= 9), intltool, libxfce4util-dev, libxfce4ui-1-dev, 
+ xfce4-panel-dev (>= 4.8.0), xfce4-dev-tools, libtool,
+ dh-autoreconf, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://michael.orlitzky.com/code/xfce4-hdaps.php
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-hdaps/

Modified: goodies/trunk/xfce4-hdaps/debian/rules
===================================================================
--- goodies/trunk/xfce4-hdaps/debian/rules	2012-04-08 12:20:51 UTC (rev 6644)
+++ goodies/trunk/xfce4-hdaps/debian/rules	2012-04-08 12:24:22 UTC (rev 6645)
@@ -1,14 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed #$(HARDENING_LDFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_auto_configure:
 	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure