[Pkg-xfce-commits] r6353 - desktop/trunk/xfprint4/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-23 16:43:09 +0000 (Mon, 23 Jan 2012)
New Revision: 6353

Modified:
   desktop/trunk/xfprint4/debian/changelog
   desktop/trunk/xfprint4/debian/compat
   desktop/trunk/xfprint4/debian/control
   desktop/trunk/xfprint4/debian/rules
Log:
* debian/rules:
  - use debhelper 9 hardening support
  - use multiarch paths.
* debian/compat bumped to 9.
* debian/control:
  - update debhelper build-dep to 9 for hardening support.
  - add dpkg-dev 1.16.1 for hardening support.
  - drop hardening-includes build-dep.

Modified: desktop/trunk/xfprint4/debian/changelog
===================================================================
--- desktop/trunk/xfprint4/debian/changelog	2012-01-23 16:35:38 UTC (rev 6352)
+++ desktop/trunk/xfprint4/debian/changelog	2012-01-23 16:43:09 UTC (rev 6353)
@@ -1,9 +1,20 @@
 xfprint4 (4.6.1-3) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches:
     - 06_fix-xfconf-backend-key.patch: added, fix a typo in the name of the
       xfconf key retrieved to know the printing backend.            lp: #472656
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use debhelper 9 hardening support
+    - use multiarch paths.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - update debhelper build-dep to 9 for hardening support.
+    - add dpkg-dev 1.16.1 for hardening support.
+    - drop hardening-includes build-dep.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 05 Jan 2012 23:15:07 +0100
 
 xfprint4 (4.6.1-2) unstable; urgency=low

Modified: desktop/trunk/xfprint4/debian/compat
===================================================================
--- desktop/trunk/xfprint4/debian/compat	2012-01-23 16:35:38 UTC (rev 6352)
+++ desktop/trunk/xfprint4/debian/compat	2012-01-23 16:43:09 UTC (rev 6353)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfprint4/debian/control
===================================================================
--- desktop/trunk/xfprint4/debian/control	2012-01-23 16:35:38 UTC (rev 6352)
+++ desktop/trunk/xfprint4/debian/control	2012-01-23 16:43:09 UTC (rev 6353)
@@ -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), libxft-dev,
+Build-Depends: debhelper (>= 9), libgtk2.0-dev (>= 2.10.6), libxft-dev,
  a2ps, lpr, libcups2-dev, chrpath, sharutils, quilt, 
- libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, intltool, hardening-includes
+ libxfcegui4-dev (>= 4.6.0), libxfconf-0-dev, intltool, 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/xfprint4/

Modified: desktop/trunk/xfprint4/debian/rules
===================================================================
--- desktop/trunk/xfprint4/debian/rules	2012-01-23 16:35:38 UTC (rev 6352)
+++ desktop/trunk/xfprint4/debian/rules	2012-01-23 16:43:09 UTC (rev 6353)
@@ -1,14 +1,8 @@
 #!/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
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
@@ -18,15 +12,15 @@
 	dh_auto_clean
 
 override_dh_install:
-	rm -f debian/xfprint4/usr/lib/libxfprint.so
+	rm -f debian/xfprint4/usr/lib/$(DEB_HOST_MULTIARCH)/libxfprint.so
 
-	rm -f debian/xfprint4/usr/lib/xfce4/*plugins/*.a
-	rm -f debian/xfprint4/usr/lib/xfce4/*plugins/*.la
-	rm -f debian/xfprint4/usr/lib/*.la
+	rm -f debian/xfprint4/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/*plugins/*.a
+	rm -f debian/xfprint4/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/*plugins/*.la
+	rm -f debian/xfprint4/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
-	chrpath -d -k debian/xfprint4/usr/lib/*.so.* \
+	chrpath -d -k debian/xfprint4/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.* \
 		debian/xfprint4/usr/bin/* \
-		debian/xfprint4/usr/lib/xfce4/xfprint-plugins/*
+		debian/xfprint4/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/xfprint-plugins/*
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l`pwd`/debian/xfprint4/usr/lib/