[Pkg-xfce-commits] r6592 - desktop/branches/experimental/xfce4-appfinder/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-02 12:24:25 +0000 (Mon, 02 Apr 2012)
New Revision: 6592

Modified:
   desktop/branches/experimental/xfce4-appfinder/debian/changelog
   desktop/branches/experimental/xfce4-appfinder/debian/compat
   desktop/branches/experimental/xfce4-appfinder/debian/control
   desktop/branches/experimental/xfce4-appfinder/debian/rules
Log:
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop build-dep on hardening-includes.
* debian/compat bumped to 9.
* debian/rules:
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.

Modified: desktop/branches/experimental/xfce4-appfinder/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/changelog	2012-04-02 12:17:25 UTC (rev 6591)
+++ desktop/branches/experimental/xfce4-appfinder/debian/changelog	2012-04-02 12:24:25 UTC (rev 6592)
@@ -14,6 +14,12 @@
   [ Yves-Alexis Perez ]
   * debian/control:
     - update standards version to 3.9.3.
+    - update debhelper build-dep to 9.
+    - add build-dep on dpkg-dev 1.16.1.
+    - drop build-dep on hardening-includes.
+  * debian/compat bumped to 9.
+  * debian/rules:
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
 
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Wed, 21 Sep 2011 23:41:48 +0200
 

Modified: desktop/branches/experimental/xfce4-appfinder/debian/compat
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/compat	2012-04-02 12:17:25 UTC (rev 6591)
+++ desktop/branches/experimental/xfce4-appfinder/debian/compat	2012-04-02 12:24:25 UTC (rev 6592)
@@ -1 +1 @@
-7
+9

Modified: desktop/branches/experimental/xfce4-appfinder/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/control	2012-04-02 12:17:25 UTC (rev 6591)
+++ desktop/branches/experimental/xfce4-appfinder/debian/control	2012-04-02 12:24:25 UTC (rev 6592)
@@ -3,10 +3,10 @@
 Priority: optional
 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~), libxfce4util6-dev,
+Build-Depends: debhelper (>= 9), libxfce4util6-dev,
  libxfce4ui-1-dev (>= 4.9.0), libxft-dev, libxml-parser-perl, libgtk2.0-dev,
  libxfconf-0-dev (>= 4.8.0), libgarcon-1-0-dev (>= 0.1.0), intltool, 
- hardening-includes
+ dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.3
 Homepage: http://www.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-appfinder/

Modified: desktop/branches/experimental/xfce4-appfinder/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-appfinder/debian/rules	2012-04-02 12:17:25 UTC (rev 6591)
+++ desktop/branches/experimental/xfce4-appfinder/debian/rules	2012-04-02 12:24:25 UTC (rev 6592)
@@ -1,13 +1,8 @@
 #!/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 DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 override_dh_install:
 	# install menu pixmap
 	install -d $(CURDIR)/debian/xfce4-appfinder/usr/share/pixmaps