[Pkg-xfce-commits] r6342 - goodies/trunk/xfce4-screenshooter/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-23 15:37:43 +0000 (Mon, 23 Jan 2012)
New Revision: 6342

Modified:
   goodies/trunk/xfce4-screenshooter/debian/changelog
   goodies/trunk/xfce4-screenshooter/debian/compat
   goodies/trunk/xfce4-screenshooter/debian/control
   goodies/trunk/xfce4-screenshooter/debian/rules
Log:
* debian/rules:
  - switch to debhelper 9 hardening support.
  - switch rules do multiarch.
* debian/compat bumped to 9.
* debian/control:
  - bump debhelper build-dep to 8.9.4 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.

Modified: goodies/trunk/xfce4-screenshooter/debian/changelog
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/changelog	2012-01-23 15:34:02 UTC (rev 6341)
+++ goodies/trunk/xfce4-screenshooter/debian/changelog	2012-01-23 15:37:43 UTC (rev 6342)
@@ -1,9 +1,19 @@
 xfce4-screenshooter (1.8.0-2) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * debian/patches:
     - 01_fix-crash-with-some-wms.patch: added, fix a crash that occurs with some
       wms, e.g. awesome, when taking a screenshot.  lp: #830920, Closes: #648739
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - switch to debhelper 9 hardening support.
+    - switch rules do multiarch.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - bump debhelper build-dep to 8.9.4 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 05 Jan 2012 22:38:25 +0100
 
 xfce4-screenshooter (1.8.0-1) unstable; urgency=low

Modified: goodies/trunk/xfce4-screenshooter/debian/compat
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/compat	2012-01-23 15:34:02 UTC (rev 6341)
+++ goodies/trunk/xfce4-screenshooter/debian/compat	2012-01-23 15:37:43 UTC (rev 6342)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-screenshooter/debian/control
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/control	2012-01-23 15:34:02 UTC (rev 6341)
+++ goodies/trunk/xfce4-screenshooter/debian/control	2012-01-23 15:37:43 UTC (rev 6342)
@@ -3,10 +3,10 @@
 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~), autotools-dev, libxml-parser-perl,
+Build-Depends: debhelper (>= 8.9.4), autotools-dev, libxml-parser-perl,
  xfce4-panel-dev (>= 4.8.0), libgtk2.0-dev, intltool, libcurl4-gnutls-dev,
  libxmlrpc-c3-dev, libsoup2.4-dev, libxfce4ui-1-dev, hardening-includes, 
- libexo-1-dev
+ libexo-1-dev, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-screenshooter
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-screenshooter/

Modified: goodies/trunk/xfce4-screenshooter/debian/rules
===================================================================
--- goodies/trunk/xfce4-screenshooter/debian/rules	2012-01-23 15:34:02 UTC (rev 6341)
+++ goodies/trunk/xfce4-screenshooter/debian/rules	2012-01-23 15:37:43 UTC (rev 6342)
@@ -1,15 +1,9 @@
 #!/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,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 override_dh_shlibdeps:
-	dh_shlibdeps -X debian/xfce4-screenshooter/usr/lib/xfce4-screenshooter/xfce4/panel-plugins/xfce4-screenshooter-plugin -- -dRecommends debian/xfce4-screenshooter/usr/lib/xfce4-screenshooter/xfce4/panel-plugins/xfce4-screenshooter-plugin -dDepends
+	dh_shlibdeps -X debian/xfce4-screenshooter/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4-screenshooter/xfce4/panel-plugins/xfce4-screenshooter-plugin -- -dRecommends debian/xfce4-screenshooter/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4-screenshooter/xfce4/panel-plugins/xfce4-screenshooter-plugin -dDepends
 
 %:
 	dh $@