[Pkg-xfce-commits] r6704 - desktop/branches/experimental/gtk2-engines-xfce/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-08 20:33:55 +0000 (Sun, 08 Apr 2012)
New Revision: 6704

Modified:
   desktop/branches/experimental/gtk2-engines-xfce/debian/changelog
   desktop/branches/experimental/gtk2-engines-xfce/debian/compat
   desktop/branches/experimental/gtk2-engines-xfce/debian/control
   desktop/branches/experimental/gtk2-engines-xfce/debian/rules
Log:
  - 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/gtk2-engines-xfce/debian/changelog
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2012-04-08 20:32:23 UTC (rev 6703)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/changelog	2012-04-08 20:33:55 UTC (rev 6704)
@@ -15,6 +15,12 @@
   [ Yves-Alexis Perez ]
   * debian/rules:
     - build with --parallel.
+    - 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>  Sun, 12 Feb 2012 17:23:03 +0100
 

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/compat
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/compat	2012-04-08 20:32:23 UTC (rev 6703)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/compat	2012-04-08 20:33:55 UTC (rev 6704)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/control
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/control	2012-04-08 20:32:23 UTC (rev 6703)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/control	2012-04-08 20:33:55 UTC (rev 6704)
@@ -3,9 +3,9 @@
 Priority: optional
 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~), libglib2.0-dev (>= 2.24.0),
+Build-Depends: debhelper (>= 9), libglib2.0-dev (>= 2.24.0),
  libgtk2.0-dev (>= 2.20.0), libgtk-3-dev (>= 3.0.0), libx11-dev (>> 2:1.0.0-6),
- hardening-includes, xfce4-dev-tools, autoconf, automake, libtool
+ dpkg-dev (>= 1.16.1), xfce4-dev-tools, autoconf, automake, libtool
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/

Modified: desktop/branches/experimental/gtk2-engines-xfce/debian/rules
===================================================================
--- desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2012-04-08 20:32:23 UTC (rev 6703)
+++ desktop/branches/experimental/gtk2-engines-xfce/debian/rules	2012-04-08 20:33:55 UTC (rev 6704)
@@ -1,14 +1,8 @@
 #!/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=+pie,+bindnow
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS)-Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_auto_configure:
 	NOCONFIGURE=1 xdt-autogen
 	dh_auto_configure