[Pkg-xfce-commits] r6698 - desktop/branches/experimental/xfce4-dev-tools/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-08 20:28:35 +0000 (Sun, 08 Apr 2012)
New Revision: 6698

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

Modified: desktop/branches/experimental/xfce4-dev-tools/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-dev-tools/debian/changelog	2012-04-08 20:26:34 UTC (rev 6697)
+++ desktop/branches/experimental/xfce4-dev-tools/debian/changelog	2012-04-08 20:28:35 UTC (rev 6698)
@@ -1,7 +1,17 @@
 xfce4-dev-tools (4.9.1-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream development release.
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop hardening-includes build-dep.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 21 Jan 2012 20:15:53 +0100
 
 xfce4-dev-tools (4.9.0-1) experimental; urgency=low

Modified: desktop/branches/experimental/xfce4-dev-tools/debian/compat
===================================================================
--- desktop/branches/experimental/xfce4-dev-tools/debian/compat	2012-04-08 20:26:34 UTC (rev 6697)
+++ desktop/branches/experimental/xfce4-dev-tools/debian/compat	2012-04-08 20:28:35 UTC (rev 6698)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/xfce4-dev-tools/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-dev-tools/debian/control	2012-04-08 20:26:34 UTC (rev 6697)
+++ desktop/branches/experimental/xfce4-dev-tools/debian/control	2012-04-08 20:28:35 UTC (rev 6698)
@@ -4,7 +4,8 @@
 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), autotools-dev, libglib2.0-dev, hardening-includes
+Build-Depends: debhelper (>= 9), autotools-dev, libglib2.0-dev, 
+ dpkg-dev (>= 1.16.1.)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-dev-tools/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-dev-tools/

Modified: desktop/branches/experimental/xfce4-dev-tools/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-dev-tools/debian/rules	2012-04-08 20:26:34 UTC (rev 6697)
+++ desktop/branches/experimental/xfce4-dev-tools/debian/rules	2012-04-08 20:28:35 UTC (rev 6698)
@@ -1,13 +1,7 @@
 #!/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
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
-
 %:
 	dh $@