[Pkg-xfce-commits] r6989 - goodies/trunk/xfce4-volumed/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-05-15 20:15:19 +0000 (Tue, 15 May 2012)
New Revision: 6989

Modified:
   goodies/trunk/xfce4-volumed/debian/changelog
   goodies/trunk/xfce4-volumed/debian/compat
   goodies/trunk/xfce4-volumed/debian/control
   goodies/trunk/xfce4-volumed/debian/rules
Log:
  - update debhelper build-dep to 9 and add dpkg-dev 1.16.1 build-dep for
    hardening support.
* debian/rules:
  - switch to dpkg-dev 1.16.1 an debhelper 9 hardening support.
* debian/compat bumped to 9.

Modified: goodies/trunk/xfce4-volumed/debian/changelog
===================================================================
--- goodies/trunk/xfce4-volumed/debian/changelog	2012-05-15 20:13:04 UTC (rev 6988)
+++ goodies/trunk/xfce4-volumed/debian/changelog	2012-05-15 20:15:19 UTC (rev 6989)
@@ -2,6 +2,11 @@
 
   * debian/control:
     - add depends on a gstreamer audiosink.                     closes: #673060
+    - update debhelper build-dep to 9 and add dpkg-dev 1.16.1 build-dep for
+      hardening support.
+  * debian/rules:
+    - switch to dpkg-dev 1.16.1 an debhelper 9 hardening support.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 15 May 2012 22:12:17 +0200
 

Modified: goodies/trunk/xfce4-volumed/debian/compat
===================================================================
--- goodies/trunk/xfce4-volumed/debian/compat	2012-05-15 20:13:04 UTC (rev 6988)
+++ goodies/trunk/xfce4-volumed/debian/compat	2012-05-15 20:15:19 UTC (rev 6989)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-volumed/debian/control
===================================================================
--- goodies/trunk/xfce4-volumed/debian/control	2012-05-15 20:13:04 UTC (rev 6988)
+++ goodies/trunk/xfce4-volumed/debian/control	2012-05-15 20:15:19 UTC (rev 6989)
@@ -4,9 +4,9 @@
 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), libxfconf-0-dev, libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev, libnotify-dev, hardening-includes, 
- libkeybinder-dev (>= 0.2.2-2), libgtk2.0-dev
+Build-Depends: debhelper (>= 9), libxfconf-0-dev, libgstreamer0.10-dev,
+ libgstreamer-plugins-base0.10-dev, libnotify-dev,
+ libkeybinder-dev (>= 0.2.2-2), libgtk2.0-dev, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/projects/applications/xfce4-volumed
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-volumed/

Modified: goodies/trunk/xfce4-volumed/debian/rules
===================================================================
--- goodies/trunk/xfce4-volumed/debian/rules	2012-05-15 20:13:04 UTC (rev 6988)
+++ goodies/trunk/xfce4-volumed/debian/rules	2012-05-15 20:15:19 UTC (rev 6989)
@@ -1,12 +1,7 @@
 #!/usr/bin/make -f
-include /usr/share/hardening-includes/hardening.make
 
-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 DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 %:
 	dh $@