[Pkg-xfce-commits] r7331 - goodies/trunk/xfce4-datetime-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2013-03-06 22:35:31 +0000 (Wed, 06 Mar 2013)
New Revision: 7331

Modified:
   goodies/trunk/xfce4-datetime-plugin/debian/changelog
   goodies/trunk/xfce4-datetime-plugin/debian/compat
   goodies/trunk/xfce4-datetime-plugin/debian/control
   goodies/trunk/xfce4-datetime-plugin/debian/rules
Log:
* debian/rules:
  - use debhelper 9 and dpkg hardening support
* debian/compat bumped to 9.
* debian/control:
  - update debhelper build-dep to 9.
  - replace libxfcegui4 build-dep by libxfce4ui.

Modified: goodies/trunk/xfce4-datetime-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/changelog	2013-03-06 22:27:17 UTC (rev 7330)
+++ goodies/trunk/xfce4-datetime-plugin/debian/changelog	2013-03-06 22:35:31 UTC (rev 7331)
@@ -1,6 +1,12 @@
 xfce4-datetime-plugin (0.6.2-1) UNRELEASED; urgency=low
 
   * New upstream release.                                       closes: #702459
+  * debian/rules:
+    - use debhelper 9 and dpkg hardening support
+  * debian/compat bumped to 9.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - replace libxfcegui4 build-dep by libxfce4ui.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 06 Mar 2013 23:26:51 +0100
 

Modified: goodies/trunk/xfce4-datetime-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/compat	2013-03-06 22:27:17 UTC (rev 7330)
+++ goodies/trunk/xfce4-datetime-plugin/debian/compat	2013-03-06 22:35:31 UTC (rev 7331)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-datetime-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/control	2013-03-06 22:27:17 UTC (rev 7330)
+++ goodies/trunk/xfce4-datetime-plugin/debian/control	2013-03-06 22:35:31 UTC (rev 7331)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: autotools-dev, intltool, debhelper (>= 7.0.50~),
+Build-Depends: intltool, debhelper (>= 9),
  libgtk2.0-dev, libxfcegui4-dev (>= 4.8.0), xfce4-panel-dev (>= 4.8.0),
- libxml2-dev, libxml-parser-perl, hardening-includes
+ libxml2-dev, libxml-parser-perl
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-datetime-plugin/

Modified: goodies/trunk/xfce4-datetime-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-datetime-plugin/debian/rules	2013-03-06 22:27:17 UTC (rev 7330)
+++ goodies/trunk/xfce4-datetime-plugin/debian/rules	2013-03-06 22:35:31 UTC (rev 7331)
@@ -1,14 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/hardening-includes/hardening.make
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
-LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
-#CFLAGS+=$(HARDENING_CFLAGS)
-LDFLAGS+=-Wl,-z,defs -Wl,--as-needed #$(HARDENING_LDFLAGS)
-
-export CFLAGS LDFLAGS
-
 %:
 	dh $@