[Pkg-xfce-commits] r7247 - desktop/branches/experimental/xfce4-terminal/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-12-28 11:07:30 +0000 (Fri, 28 Dec 2012)
New Revision: 7247

Modified:
   desktop/branches/experimental/xfce4-terminal/debian/changelog
   desktop/branches/experimental/xfce4-terminal/debian/compat
   desktop/branches/experimental/xfce4-terminal/debian/control
   desktop/branches/experimental/xfce4-terminal/debian/rules
Log:
  - use debhelper 9 hardening support.
* debian/compat bumped to 9.
* debian/control:
  - add build-dep on libxfce4ui-dev.
  - update debhelper build-dep to 9.

Modified: desktop/branches/experimental/xfce4-terminal/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/changelog	2012-12-28 10:53:20 UTC (rev 7246)
+++ desktop/branches/experimental/xfce4-terminal/debian/changelog	2012-12-28 11:07:30 UTC (rev 7247)
@@ -5,6 +5,11 @@
   * debian/rules:
     - remove the renaming, done upstream now.
     - use dh --parallel.
+    - use debhelper 9 hardening support.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - add build-dep on libxfce4ui-dev.
+    - update debhelper build-dep to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 28 Dec 2012 11:28:30 +0100
 

Modified: desktop/branches/experimental/xfce4-terminal/debian/compat
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/compat	2012-12-28 10:53:20 UTC (rev 7246)
+++ desktop/branches/experimental/xfce4-terminal/debian/compat	2012-12-28 11:07:30 UTC (rev 7247)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/xfce4-terminal/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/control	2012-12-28 10:53:20 UTC (rev 7246)
+++ desktop/branches/experimental/xfce4-terminal/debian/control	2012-12-28 11:07:30 UTC (rev 7247)
@@ -4,7 +4,7 @@
 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~), libdbus-glib-1-dev, 
+Build-Depends: debhelper (>= 9), libdbus-glib-1-dev, 
  libexo-1-dev (>= 0.10.0), libvte-dev (>= 1:0.28), libxml-perl,
  libstartup-notification0-dev, chrpath, intltool, libgtk2.0-dev (>= 2.14),
  hardening-includes, libxfce4ui-1-dev (>= 4.10)

Modified: desktop/branches/experimental/xfce4-terminal/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-terminal/debian/rules	2012-12-28 10:53:20 UTC (rev 7246)
+++ desktop/branches/experimental/xfce4-terminal/debian/rules	2012-12-28 11:07:30 UTC (rev 7247)
@@ -1,21 +1,18 @@
 #!/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)
-LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
 
-export CFLAGS LDFLAGS
-
-
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-dbus 
 
-override_dh_auto_install:
-	dh_auto_install --fail-missing
+override_dh_install:
+	dh_install --fail-missing
 	
+override_dh_auto_install:
+	dh_auto_install
+
 	install -c -m 0755 $(CURDIR)/debian/xfce4-terminal.wrapper $(CURDIR)/debian/tmp/usr/bin/xfce4-terminal.wrapper
 	
 	#install pixmap for debian menu