[Pkg-xfce-commits] r6243 - goodies/trunk/thunar-media-tags-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-30 21:17:41 +0000 (Wed, 30 Nov 2011)
New Revision: 6243

Modified:
   goodies/trunk/thunar-media-tags-plugin/debian/changelog
   goodies/trunk/thunar-media-tags-plugin/debian/compat
   goodies/trunk/thunar-media-tags-plugin/debian/control
   goodies/trunk/thunar-media-tags-plugin/debian/rules
Log:
  - use dh9 and dpkg-dev 1.16.1 hardening rules.
* debian/compat bumped to 9 for hardening support.
* debian/control:
  - update debhelper build-dep for hardening support
  - add dpkg-dev build-dep for hardening support
  - drop build-deps for autoreconf.

Modified: goodies/trunk/thunar-media-tags-plugin/debian/changelog
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/changelog	2011-11-30 21:08:44 UTC (rev 6242)
+++ goodies/trunk/thunar-media-tags-plugin/debian/changelog	2011-11-30 21:17:41 UTC (rev 6243)
@@ -7,6 +7,12 @@
       dropped, included upstream.
   * debian/rules:
     - drop xdt-autogen rules, not needed anymore.
+    - use dh9 and dpkg-dev 1.16.1 hardening rules.
+  * debian/compat bumped to 9 for hardening support.
+  * debian/control:
+    - update debhelper build-dep for hardening support
+    - add dpkg-dev build-dep for hardening support
+    - drop build-deps for autoreconf.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 30 Nov 2011 21:08:29 +0100
 

Modified: goodies/trunk/thunar-media-tags-plugin/debian/compat
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/compat	2011-11-30 21:08:44 UTC (rev 6242)
+++ goodies/trunk/thunar-media-tags-plugin/debian/compat	2011-11-30 21:17:41 UTC (rev 6243)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/thunar-media-tags-plugin/debian/control
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/control	2011-11-30 21:08:44 UTC (rev 6242)
+++ goodies/trunk/thunar-media-tags-plugin/debian/control	2011-11-30 21:17:41 UTC (rev 6243)
@@ -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~), pkg-config, libthunarx-2-dev (>= 1.0.1),
+Build-Depends: debhelper (>= 8.9.4), pkg-config, libthunarx-2-dev (>= 1.0.1),
  libexo-1-dev (>= 0.5.0), libtagc0-dev, libxml-parser-perl, intltool,
- hardening-includes, xfce4-dev-tools, automake, autoconf, libtool
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/thunar-media-tags-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/thunar-media-tags-plugin/

Modified: goodies/trunk/thunar-media-tags-plugin/debian/rules
===================================================================
--- goodies/trunk/thunar-media-tags-plugin/debian/rules	2011-11-30 21:08:44 UTC (rev 6242)
+++ goodies/trunk/thunar-media-tags-plugin/debian/rules	2011-11-30 21:17:41 UTC (rev 6243)
@@ -1,15 +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
 
-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
-
-
 %:
 	dh $@