[Pkg-xfce-commits] r6854 - desktop/trunk/xfce4-mixer/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-22 15:44:38 +0000 (Sun, 22 Apr 2012)
New Revision: 6854

Modified:
   desktop/trunk/xfce4-mixer/debian/changelog
   desktop/trunk/xfce4-mixer/debian/compat
   desktop/trunk/xfce4-mixer/debian/control
   desktop/trunk/xfce4-mixer/debian/rules
Log:
  - update debhelper build-dep to 9.
  - add build-dep on dpkg-dev 1.16.1.
  - drop cdbs build-dep.
* debian/rules:
  - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
  - use --parallel.
* debian/compat bumped to 9.

Modified: desktop/trunk/xfce4-mixer/debian/changelog
===================================================================
--- desktop/trunk/xfce4-mixer/debian/changelog	2012-04-22 15:35:22 UTC (rev 6853)
+++ desktop/trunk/xfce4-mixer/debian/changelog	2012-04-22 15:44:38 UTC (rev 6854)
@@ -3,6 +3,13 @@
   * Remove lintian overrides.                                   closes: #670045
   * 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 cdbs build-dep.
+  * debian/rules:
+    - use debhelper 9 / dpkg-dev 1.16.1 hardening support.
+    - use --parallel.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 22 Apr 2012 17:32:25 +0200
 

Modified: desktop/trunk/xfce4-mixer/debian/compat
===================================================================
--- desktop/trunk/xfce4-mixer/debian/compat	2012-04-22 15:35:22 UTC (rev 6853)
+++ desktop/trunk/xfce4-mixer/debian/compat	2012-04-22 15:44:38 UTC (rev 6854)
@@ -1 +1 @@
-7
+9

Modified: desktop/trunk/xfce4-mixer/debian/control
===================================================================
--- desktop/trunk/xfce4-mixer/debian/control	2012-04-22 15:35:22 UTC (rev 6853)
+++ desktop/trunk/xfce4-mixer/debian/control	2012-04-22 15:44:38 UTC (rev 6854)
@@ -4,11 +4,11 @@
 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~), pkg-config, libglib2.0-dev,
+Build-Depends: debhelper (>= 9), pkg-config, libglib2.0-dev,
  libgstreamer-plugins-base0.10-dev, libgtk2.0-dev, 
  libxfce4util-dev (>= 4.8.0), libxfce4ui-1-dev (>= 4.8.0), 
  xfce4-panel-dev (>= 4.8.0), libxml-parser-perl, 
- libxfconf-0-dev (>= 4.8.0), intltool, hardening-includes
+ libxfconf-0-dev (>= 4.8.0), intltool, 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-mixer/

Modified: desktop/trunk/xfce4-mixer/debian/rules
===================================================================
--- desktop/trunk/xfce4-mixer/debian/rules	2012-04-22 15:35:22 UTC (rev 6853)
+++ desktop/trunk/xfce4-mixer/debian/rules	2012-04-22 15:44:38 UTC (rev 6854)
@@ -1,16 +1,10 @@
 #!/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 $@
+	dh $@ --parallel
 
 override_dh_auto_install:
 	dh_auto_install