[Pkg-xfce-commits] r4534 - goodies/branches/experimental/xfce4-power-manager/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2010-11-07 12:12:36 +0000 (Sun, 07 Nov 2010)
New Revision: 4534

Modified:
   goodies/branches/experimental/xfce4-power-manager/debian/changelog
   goodies/branches/experimental/xfce4-power-manager/debian/control
   goodies/branches/experimental/xfce4-power-manager/debian/rules
Log:
  - add build-dep on hardening-includes.
* debian/rules:
  - add -O1, -z,defs and --as-needed to LDFLAGS.
  - add hardening flags to {C,LD}FLAGS.

Modified: goodies/branches/experimental/xfce4-power-manager/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/changelog	2010-11-07 11:27:41 UTC (rev 4533)
+++ goodies/branches/experimental/xfce4-power-manager/debian/changelog	2010-11-07 12:12:36 UTC (rev 4534)
@@ -7,6 +7,10 @@
     - add build-dep on libpolkit-gobject-1-dev, libxext-dev and libx11-dev.
     - replace dep on hal by upower.
     - add suggest on udisks for disk spinning.
+    - add build-dep on hardening-includes.
+  * debian/rules:
+    - add -O1, -z,defs and --as-needed to LDFLAGS.
+    - add hardening flags to {C,LD}FLAGS.
 
   [ Lionel Le Folgoc ]
   * debian/control:
@@ -15,7 +19,7 @@
   * Switch to 3.0 (quilt).
   * debian/rules: use dpkg-buildflags for cflags/ldflags handling.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Wed, 19 May 2010 19:38:01 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Nov 2010 12:32:16 +0100
 
 xfce4-power-manager (0.8.5-1) unstable; urgency=low
 

Modified: goodies/branches/experimental/xfce4-power-manager/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/control	2010-11-07 11:27:41 UTC (rev 4533)
+++ goodies/branches/experimental/xfce4-power-manager/debian/control	2010-11-07 12:12:36 UTC (rev 4534)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 7.0.50), intltool, pkg-config, libgtk2.0-dev,
  libdbus-1-dev, libdbus-glib-1-dev, libxfconf-0-dev (>= 4.6.0),
  libxfce4ui-1-dev (>= 4.7.0), libnotify-dev, xfce4-panel-dev (>= 4.6.0),
- libpolkit-gobject-1-dev, libxext-dev, libx11-dev
+ libpolkit-gobject-1-dev, libxext-dev, libx11-dev, hardening-includes
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-power-manager/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-power-manager/

Modified: goodies/branches/experimental/xfce4-power-manager/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-power-manager/debian/rules	2010-11-07 11:27:41 UTC (rev 4533)
+++ goodies/branches/experimental/xfce4-power-manager/debian/rules	2010-11-07 12:12:36 UTC (rev 4534)
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
+include /usr/share/hardening-includes/hardening.make
+
 CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+LDFLAGS+=$(HARDENING_LDFLAGS) -Wl,-z,defs -Wl,--as-needed -Wl,-O1
+CFLAGS+=$(HARDENING_CFLAGS)
 
 override_dh_install:
 	dh_install --list-missing