[Pkg-xfce-commits] r8153 - in /goodies/trunk/gigolo/debian: changelog compat control rules

[Jackson Doak]

Author: noskcaj-guest
Date: Thu Jan  9 20:38:20 2014
New Revision: 8153

URL: http://svn.debian.org/wsvn/pkg-xfce/?sc=1&rev=8153
Log:
* debian/control:
  - Bump debhelper to 9
  - Drop hardening-includes, no longer needed
* debian/rules: 
  - Switch from hardening includes to debhelper 9 hardening
* debian/compat: Bump to 9

Modified:
    goodies/trunk/gigolo/debian/changelog
    goodies/trunk/gigolo/debian/compat
    goodies/trunk/gigolo/debian/control
    goodies/trunk/gigolo/debian/rules

Modified: goodies/trunk/gigolo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/changelog?rev=8153&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/changelog	(original)
+++ goodies/trunk/gigolo/debian/changelog	Thu Jan  9 20:38:20 2014
@@ -7,6 +7,12 @@
   * New upstream release
     - Drop waf support, we no longer need to repack
     - Never make the Connect button insensitive. LP: #1131156
+  * debian/control:
+    - Bump debhelper to 9
+    - Drop hardening-includes, no longer needed
+  * debian/rules: 
+    - Switch from hardening includes to debhelper 9 hardening
+  * debian/compat: Bump to 9
 
  -- Jackson Doak <noskcaj at ubuntu.com>  Fri, 10 Jan 2014 07:22:45 +1100
 

Modified: goodies/trunk/gigolo/debian/compat
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/compat?rev=8153&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/compat	(original)
+++ goodies/trunk/gigolo/debian/compat	Thu Jan  9 20:38:20 2014
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/gigolo/debian/control
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/control?rev=8153&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/control	(original)
+++ goodies/trunk/gigolo/debian/control	Thu Jan  9 20:38:20 2014
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Stefan Ott <stefan at ott.net>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config,
-  libgtk2.0-dev (>= 2.12.0), hardening-includes
+Build-Depends: debhelper (>= 9), intltool, pkg-config,
+  libgtk2.0-dev (>= 2.12.0)
 Standards-Version: 3.9.2
 Homepage: http://www.uvena.de/gigolo/
 Vcs-Svn: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/gigolo/

Modified: goodies/trunk/gigolo/debian/rules
URL: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/gigolo/debian/rules?rev=8153&op=diff
==============================================================================
--- goodies/trunk/gigolo/debian/rules	(original)
+++ goodies/trunk/gigolo/debian/rules	Thu Jan  9 20:38:20 2014
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
-
-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
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
 	dh $@