[Pkg-xfce-commits] r6203 - goodies/trunk/xfce4-weather-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-11-09 17:11:23 +0000 (Wed, 09 Nov 2011)
New Revision: 6203

Modified:
   goodies/trunk/xfce4-weather-plugin/debian/changelog
   goodies/trunk/xfce4-weather-plugin/debian/compat
   goodies/trunk/xfce4-weather-plugin/debian/control
   goodies/trunk/xfce4-weather-plugin/debian/rules
Log:
* debian/rules:
  - switch to debhelper with hardening support
* debian/control:
  - update debhelper build-dep to 8.9.4 for hardening support.
  - add dpkg-dev 1.16.1 build-dep for hardening support.
  - drop cdbs and hardening-includes.
  - fix typo in long description.
* debian/compat bumped to 9.

Modified: goodies/trunk/xfce4-weather-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/changelog	2011-11-09 16:53:04 UTC (rev 6202)
+++ goodies/trunk/xfce4-weather-plugin/debian/changelog	2011-11-09 17:11:23 UTC (rev 6203)
@@ -4,6 +4,14 @@
     - 00_license added, change the license key for the one from CTW since it
       seems to work and brings back the feature. Temporary fix until a real
       solution is found.                                        closes: #647749
+  * debian/rules:
+    - switch to debhelper with hardening support
+  * debian/control:
+    - update debhelper build-dep to 8.9.4 for hardening support.
+    - add dpkg-dev 1.16.1 build-dep for hardening support.
+    - drop cdbs and hardening-includes.
+    - fix typo in long description.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Wed, 09 Nov 2011 17:51:44 +0100
 

Modified: goodies/trunk/xfce4-weather-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/compat	2011-11-09 16:53:04 UTC (rev 6202)
+++ goodies/trunk/xfce4-weather-plugin/debian/compat	2011-11-09 17:11:23 UTC (rev 6203)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-weather-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/control	2011-11-09 16:53:04 UTC (rev 6202)
+++ goodies/trunk/xfce4-weather-plugin/debian/control	2011-11-09 17:11:23 UTC (rev 6203)
@@ -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, cdbs, debhelper (>= 7.0), 
+Build-Depends: autotools-dev, debhelper (>= 8.9.4), dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, intltool, 
- libxfcegui4-dev (>= 4.8.0), hardening-includes
+ libxfcegui4-dev (>= 4.8.0)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-weather-plugin/
@@ -16,7 +16,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: weather information plugin for the Xfce4 panel
  The weather plugin displays information about the current weather according
- your timezone and settings. It allows to search weather location code in
+ your timezone and settings. It allows one to search weather location code in
  the same plugin and displays weather status in little icons.
  .
  Features include:

Modified: goodies/trunk/xfce4-weather-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-weather-plugin/debian/rules	2011-11-09 16:53:04 UTC (rev 6202)
+++ goodies/trunk/xfce4-weather-plugin/debian/rules	2011-11-09 17:11:23 UTC (rev 6203)
@@ -1,23 +1,12 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-# It would be nice to add a cool CDBS variable here saying 
-# "do not include changelog, AUTHORS and README to dh_installdocs" 
-# (see below for the dirty hack)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs -Wl,--as-needed -Wl,-O1
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
 
-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 CFLAGS LDFLAGS
-
-binary-post-install/xfce4-weather-plugin::
+override_dh_auto_install:
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
-	# I did not found a better way to do it...
-	-cd debian/`dh_listpackages`/usr/share/doc/xfce4-weather-plugin/ && rm changelog AUTHORS README
+	dh_auto_install