[Pkg-xfce-commits] r6100 - goodies/trunk/ristretto/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-10-06 20:38:53 +0000 (Thu, 06 Oct 2011)
New Revision: 6100

Modified:
   goodies/trunk/ristretto/debian/changelog
   goodies/trunk/ristretto/debian/compat
   goodies/trunk/ristretto/debian/control
   goodies/trunk/ristretto/debian/rules
Log:
* debian/compat bumped to 9 for hardening support.
* debian/control:
  - drop build-dep on hardening-includes and update debhelper build-dep for
    compat 9 mode.
* debian/rules:
  - set hardening and ldflags the v9 way.

Modified: goodies/trunk/ristretto/debian/changelog
===================================================================
--- goodies/trunk/ristretto/debian/changelog	2011-10-06 20:25:46 UTC (rev 6099)
+++ goodies/trunk/ristretto/debian/changelog	2011-10-06 20:38:53 UTC (rev 6100)
@@ -3,6 +3,12 @@
   * New upstream releaase.
   * debian/patches:
     - 01_fix-various-memleaks dropped, included upstream.
+  * debian/compat bumped to 9 for hardening support.
+  * debian/control:
+    - drop build-dep on hardening-includes and update debhelper build-dep for
+      compat 9 mode.
+  * debian/rules:
+    - set hardening and ldflags the v9 way.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 06 Oct 2011 22:22:07 +0200
 

Modified: goodies/trunk/ristretto/debian/compat
===================================================================
--- goodies/trunk/ristretto/debian/compat	2011-10-06 20:25:46 UTC (rev 6099)
+++ goodies/trunk/ristretto/debian/compat	2011-10-06 20:38:53 UTC (rev 6100)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/ristretto/debian/control
===================================================================
--- goodies/trunk/ristretto/debian/control	2011-10-06 20:25:46 UTC (rev 6099)
+++ goodies/trunk/ristretto/debian/control	2011-10-06 20:38:53 UTC (rev 6100)
@@ -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), libexif-dev, libgtk2.0-dev,
+Build-Depends: debhelper (>= 8.9.3), libexif-dev, libgtk2.0-dev,
  libdbus-glib-1-dev, libxfce4ui-1-dev (>= 4.8.0), libglib2.0-dev (>= 2.16.0),
- libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool, hardening-includes
+ libxfconf-0-dev, libcairo2-dev (>= 1.8.0), intltool
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/ristretto/

Modified: goodies/trunk/ristretto/debian/rules
===================================================================
--- goodies/trunk/ristretto/debian/rules	2011-10-06 20:25:46 UTC (rev 6099)
+++ goodies/trunk/ristretto/debian/rules	2011-10-06 20:38:53 UTC (rev 6100)
@@ -1,13 +1,7 @@
 #!/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
-
 %:
 	dh $@