[Pkg-xfce-commits] r6348 - goodies/trunk/xfce4-timer-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-01-23 16:21:49 +0000 (Mon, 23 Jan 2012)
New Revision: 6348

Modified:
   goodies/trunk/xfce4-timer-plugin/debian/changelog
   goodies/trunk/xfce4-timer-plugin/debian/compat
   goodies/trunk/xfce4-timer-plugin/debian/control
   goodies/trunk/xfce4-timer-plugin/debian/rules
Log:
* debian/rules:
  - use debhelper 9 hardening support.
  - don't run xdt-autogen, not needed anymore.
* debian/compat bumped to 9.
* debian/control:
  - drop xfce4-dev-tools build-dep.
  - update debhelper build-dep to 9 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.

Modified: goodies/trunk/xfce4-timer-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/changelog	2012-01-23 16:09:58 UTC (rev 6347)
+++ goodies/trunk/xfce4-timer-plugin/debian/changelog	2012-01-23 16:21:49 UTC (rev 6348)
@@ -1,9 +1,20 @@
 xfce4-timer-plugin (0.6.3-1) UNRELEASED; urgency=low
 
+  [ Lionel Le Folgoc ]
   * New upstream release, including:
     - updated translations
     - fixed response on left click mouse events.                    lp: #800659
 
+  [ Yves-Alexis Perez ]
+  * debian/rules:
+    - use debhelper 9 hardening support.
+    - don't run xdt-autogen, not needed anymore.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - drop xfce4-dev-tools build-dep.
+    - update debhelper build-dep to 9 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+
  -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 05 Jan 2012 23:38:20 +0100
 
 xfce4-timer-plugin (0.6.2-1) unstable; urgency=low

Modified: goodies/trunk/xfce4-timer-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/compat	2012-01-23 16:09:58 UTC (rev 6347)
+++ goodies/trunk/xfce4-timer-plugin/debian/compat	2012-01-23 16:21:49 UTC (rev 6348)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-timer-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/control	2012-01-23 16:09:58 UTC (rev 6347)
+++ goodies/trunk/xfce4-timer-plugin/debian/control	2012-01-23 16:21:49 UTC (rev 6348)
@@ -3,10 +3,9 @@
 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~), libxml-parser-perl,
+Build-Depends: debhelper (>= 9), libxml-parser-perl,
  xfce4-panel-dev (>= 4.8.0), intltool, pkg-config, libglib2.0-dev,
- libgtk2.0-dev, libxfcegui4-dev, autotools-dev, hardening-includes,
- xfce4-dev-tools, libtool
+ libgtk2.0-dev, libxfcegui4-dev, libtool, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-timer-plugin/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/goodies/trunk/xfce4-timer-plugin/

Modified: goodies/trunk/xfce4-timer-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-timer-plugin/debian/rules	2012-01-23 16:09:58 UTC (rev 6347)
+++ goodies/trunk/xfce4-timer-plugin/debian/rules	2012-01-23 16:21:49 UTC (rev 6348)
@@ -1,15 +1,9 @@
 #!/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,-z,defs -Wl,--as-needed -Wl,-O1
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
-
 override_dh_auto_configure:
-	NOCONFIGURE=1 xdt-autogen
 	find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
 	dh_auto_configure