[Pkg-xfce-commits] r6999 - goodies/trunk/xfce4-notifyd/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-05-15 21:01:46 +0000 (Tue, 15 May 2012)
New Revision: 6999

Modified:
   goodies/trunk/xfce4-notifyd/debian/changelog
   goodies/trunk/xfce4-notifyd/debian/compat
   goodies/trunk/xfce4-notifyd/debian/control
   goodies/trunk/xfce4-notifyd/debian/rules
Log:
* debian/rules:
  - use dpkg-dev 1.16.1 and debhelper 9 hardening support.
* debian/compat bumped to 9.
* debian/control:
  - update debhelper build-dep to 9.
  - add dpkg-dev 1.16.1 build-dep.
  - drop hardening-includes build-dep.

Modified: goodies/trunk/xfce4-notifyd/debian/changelog
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/changelog	2012-05-15 21:00:18 UTC (rev 6998)
+++ goodies/trunk/xfce4-notifyd/debian/changelog	2012-05-15 21:01:46 UTC (rev 6999)
@@ -3,6 +3,13 @@
   * debian/patches:
     - 01_fix-dismiss-notifications added, backported from upstream. Correctly
       dismiss notifications when clicked.                       closes: #672646
+  * debian/rules:
+    - use dpkg-dev 1.16.1 and debhelper 9 hardening support.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - add dpkg-dev 1.16.1 build-dep.
+    - drop hardening-includes build-dep.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 15 May 2012 22:59:31 +0200
 

Modified: goodies/trunk/xfce4-notifyd/debian/compat
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/compat	2012-05-15 21:00:18 UTC (rev 6998)
+++ goodies/trunk/xfce4-notifyd/debian/compat	2012-05-15 21:01:46 UTC (rev 6999)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-notifyd/debian/control
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/control	2012-05-15 21:00:18 UTC (rev 6998)
+++ goodies/trunk/xfce4-notifyd/debian/control	2012-05-15 21:01:46 UTC (rev 6999)
@@ -4,9 +4,9 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Evgeni Golov <evgeni at debian.org>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), intltool,
+Build-Depends: debhelper (>= 9), intltool, dpkg-dev (>= 1.16.1),
  libxfce4ui-1-dev, libxfce4util-dev (>= 4.8.0), libdbus-1-dev,
- libdbus-glib-1-dev, exo-utils, libxfconf-0-dev (>= 4.8.0), hardening-includes
+ libdbus-glib-1-dev, exo-utils, libxfconf-0-dev (>= 4.8.0)
 Standards-Version: 3.9.2
 Homepage: http://spuriousinterrupt.org/projects/xfce4-notifyd
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-notifyd/

Modified: goodies/trunk/xfce4-notifyd/debian/rules
===================================================================
--- goodies/trunk/xfce4-notifyd/debian/rules	2012-05-15 21:00:18 UTC (rev 6998)
+++ goodies/trunk/xfce4-notifyd/debian/rules	2012-05-15 21:01:46 UTC (rev 6999)
@@ -1,13 +1,7 @@
 #!/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
-
 %:
 	dh $@