[Pkg-xfce-commits] r6652 - goodies/trunk/xfce4-sensors-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-08 13:15:00 +0000 (Sun, 08 Apr 2012)
New Revision: 6652

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

Modified: goodies/trunk/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/changelog	2012-04-08 13:09:16 UTC (rev 6651)
+++ goodies/trunk/xfce4-sensors-plugin/debian/changelog	2012-04-08 13:15:00 UTC (rev 6652)
@@ -8,6 +8,13 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - update standards version to 3.9.3.
+  * debian/compat bumped to 9.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-de 1.16.1.
+    - drop hardening-includes build-dep.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 21 Jan 2012 20:21:41 +0100
 

Modified: goodies/trunk/xfce4-sensors-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/compat	2012-04-08 13:09:16 UTC (rev 6651)
+++ goodies/trunk/xfce4-sensors-plugin/debian/compat	2012-04-08 13:15:00 UTC (rev 6652)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-sensors-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/control	2012-04-08 13:09:16 UTC (rev 6651)
+++ goodies/trunk/xfce4-sensors-plugin/debian/control	2012-04-08 13:15:00 UTC (rev 6652)
@@ -4,10 +4,10 @@
 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~), libgtk2.0-dev,
+Build-Depends: debhelper (>= 9), libgtk2.0-dev, dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libsensors4-dev, libxml-parser-perl,
  hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool, libxfce4ui-1-dev,
- libnotify-dev, hardening-includes
+ libnotify-dev
 Standards-Version: 3.9.3
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-sensors-plugin/

Modified: goodies/trunk/xfce4-sensors-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/rules	2012-04-08 13:09:16 UTC (rev 6651)
+++ goodies/trunk/xfce4-sensors-plugin/debian/rules	2012-04-08 13:15:00 UTC (rev 6652)
@@ -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
 
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS+=$(HARDENING_LDFLAGS) #-Wl,-O1 -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
-
-export CFLAGS LDFLAGS
-
 %:
 	dh $@