[Pkg-xfce-commits] r6775 - desktop/branches/experimental/libxfcegui4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-14 12:56:00 +0000 (Sat, 14 Apr 2012)
New Revision: 6775

Modified:
   desktop/branches/experimental/libxfcegui4/debian/changelog
   desktop/branches/experimental/libxfcegui4/debian/compat
   desktop/branches/experimental/libxfcegui4/debian/control
   desktop/branches/experimental/libxfcegui4/debian/rules
Log:
  - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
* debian/control:
  - bump debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop hardening-includes build-dep.
* debian/compat bumped to 9.

Modified: desktop/branches/experimental/libxfcegui4/debian/changelog
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/changelog	2012-04-14 12:54:37 UTC (rev 6774)
+++ desktop/branches/experimental/libxfcegui4/debian/changelog	2012-04-14 12:56:00 UTC (rev 6775)
@@ -7,6 +7,12 @@
   * New upstream development release.
   * debian/rules:
     - build with --parallel.
+    - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
+  * debian/control:
+    - bump debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop hardening-includes build-dep.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sat, 14 Apr 2012 14:54:06 +0200
 

Modified: desktop/branches/experimental/libxfcegui4/debian/compat
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/compat	2012-04-14 12:54:37 UTC (rev 6774)
+++ desktop/branches/experimental/libxfcegui4/debian/compat	2012-04-14 12:56:00 UTC (rev 6775)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/libxfcegui4/debian/control
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/control	2012-04-14 12:54:37 UTC (rev 6774)
+++ desktop/branches/experimental/libxfcegui4/debian/control	2012-04-14 12:56:00 UTC (rev 6775)
@@ -4,9 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>,
  Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev (>= 2.10.6), 
+Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.10.6), 
  libxfce4util-dev (>= 4.8.0), libxfconf-0-dev (>=4.8.0),
- libstartup-notification0-dev, libglade2-dev, intltool, hardening-includes,
+ libstartup-notification0-dev, libglade2-dev, intltool, dpkg-dev (>= 1.16.1),
  xfce4-dev-tools, libtool, gtk-doc-tools
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/

Modified: desktop/branches/experimental/libxfcegui4/debian/rules
===================================================================
--- desktop/branches/experimental/libxfcegui4/debian/rules	2012-04-14 12:54:37 UTC (rev 6774)
+++ desktop/branches/experimental/libxfcegui4/debian/rules	2012-04-14 12:56:00 UTC (rev 6775)
@@ -1,13 +1,8 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-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 DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@ --parallel