[Pkg-xfce-commits] r6297 - desktop/trunk/orage/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-05 14:00:27 +0000 (Thu, 05 Jan 2012)
New Revision: 6297

Modified:
   desktop/trunk/orage/debian/changelog
   desktop/trunk/orage/debian/compat
   desktop/trunk/orage/debian/control
   desktop/trunk/orage/debian/rules
Log:
* debian/rules:
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
  - use multiarch paths.
* debian/compat bumped to 9.
* debian/control:
  - debhelper build-dep bumped to 8.9.4 for hardening support.
  - dpkg-dev (>= 1.16.1) added for hardening support.

Modified: desktop/trunk/orage/debian/changelog
===================================================================
--- desktop/trunk/orage/debian/changelog	2012-01-05 13:41:11 UTC (rev 6296)
+++ desktop/trunk/orage/debian/changelog	2012-01-05 14:00:27 UTC (rev 6297)
@@ -2,6 +2,13 @@
 
   * New upstream release.
   * debian/watch updated for Xfce archive website.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+    - use multiarch paths.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - debhelper build-dep bumped to 8.9.4 for hardening support.
+    - dpkg-dev (>= 1.16.1) added for hardening support.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 05 Jan 2012 14:40:51 +0100
 

Modified: desktop/trunk/orage/debian/compat
===================================================================
--- desktop/trunk/orage/debian/compat	2012-01-05 13:41:11 UTC (rev 6296)
+++ desktop/trunk/orage/debian/compat	2012-01-05 14:00:27 UTC (rev 6297)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/orage/debian/control
===================================================================
--- desktop/trunk/orage/debian/control	2012-01-05 13:41:11 UTC (rev 6296)
+++ desktop/trunk/orage/debian/control	2012-01-05 14:00:27 UTC (rev 6297)
@@ -4,11 +4,11 @@
 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~), libxml-parser-perl,
+Build-Depends: debhelper (>= 8.9.4), libxml-parser-perl,
  libgtk2.0-dev (>= 2.10.1), xfce4-panel-dev (>= 4.8.0), chrpath,
  libxfcegui4-dev (>= 4.6.0), libnotify-dev, libdbus-1-dev, intltool, 
  libdbus-1-dev, libical-dev, libpopt-dev, xfce4-dev-tools, libtool,
- hardening-includes
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/orage/

Modified: desktop/trunk/orage/debian/rules
===================================================================
--- desktop/trunk/orage/debian/rules	2012-01-05 13:41:11 UTC (rev 6296)
+++ desktop/trunk/orage/debian/rules	2012-01-05 14:00:27 UTC (rev 6297)
@@ -1,20 +1,15 @@
 #!/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
 
-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 CFLAGS LDFLAGS
-
 override_dh_auto_configure:
 	dh_auto_configure -- --enable-dbus --enable-libical
 
 override_dh_install:
 	chrpath -d -k $(CURDIR)/debian/orage/usr/bin/* \
-		$(CURDIR)/debian/orage/usr/lib/orage/xfce4/*/*
+		$(CURDIR)/debian/orage/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel-plugins/*
 	dh_install --fail-missing
 
 %: