[Pkg-xfce-commits] r5788 - goodies/trunk/xfce4-sensors-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-06-14 07:04:24 +0000 (Tue, 14 Jun 2011)
New Revision: 5788

Added:
   goodies/trunk/xfce4-sensors-plugin/debian/xfce4-sensors-plugin.manpages
Modified:
   goodies/trunk/xfce4-sensors-plugin/debian/changelog
   goodies/trunk/xfce4-sensors-plugin/debian/control
   goodies/trunk/xfce4-sensors-plugin/debian/rules
Log:
  - drop cdbs build-dep.
  - add build-dep on hardening-includes.
  - switch to dh7 tiny rules with overrides.
  - pick build flags from dpkg-buildflags.
  - add hardening flags to build-flags.
  - add -O1 -z,defs and --as-needed to LDFLAGS.

Modified: goodies/trunk/xfce4-sensors-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/changelog	2011-06-13 18:05:06 UTC (rev 5787)
+++ goodies/trunk/xfce4-sensors-plugin/debian/changelog	2011-06-14 07:04:24 UTC (rev 5788)
@@ -1,4 +1,4 @@
-xfce4-sensors-plugin (1.2.1-1) UNRELEASED; urgency=low
+xfce4-sensors-plugin (1.2.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * debian/patches:
@@ -8,10 +8,16 @@
   * debian/control:
     - update libxfcegui4 build-dep to libxfce4ui
     - drop xfce4-dev-tools and libtool from build-deps.
+    - drop cdbs build-dep.
+    - add build-dep on hardening-includes.
   * debian/rules:
     - stop running xdt-autogen.
+    - switch to dh7 tiny rules with overrides.
+    - pick build flags from dpkg-buildflags.
+    - add hardening flags to build-flags.
+    - add -O1 -z,defs and --as-needed to LDFLAGS.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Mon, 09 May 2011 23:05:01 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 14 Jun 2011 08:43:28 +0200
 
 xfce4-sensors-plugin (1.0.0-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-sensors-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/control	2011-06-13 18:05:06 UTC (rev 5787)
+++ goodies/trunk/xfce4-sensors-plugin/debian/control	2011-06-14 07:04:24 UTC (rev 5788)
@@ -4,10 +4,10 @@
 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: cdbs, debhelper (>= 7), libgtk2.0-dev,
+Build-Depends: debhelper (>= 7.0.50~), libgtk2.0-dev,
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libsensors4-dev, libxml-parser-perl,
  hddtemp [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], intltool, libxfce4ui-1-dev,
- libnotify-dev
+ libnotify-dev, hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-sensors-plugin/

Modified: goodies/trunk/xfce4-sensors-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/rules	2011-06-13 18:05:06 UTC (rev 5787)
+++ goodies/trunk/xfce4-sensors-plugin/debian/rules	2011-06-14 07:04:24 UTC (rev 5788)
@@ -1,15 +1,24 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/hardening-includes/hardening.make
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-libsensors=yes --enable-procacpi --enable-hddtemp=yes --enable-notification
+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)
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -X debian/xfce4-sensors-plugin/usr/lib/xfce4/modules/libxfce4sensors.so.1.0.0
-DEB_INSTALL_MANPAGES_xfce4-sensors-plugin := debian/xfce4-sensors.1
+export CFLAGS LDFLAGS
 
-binary-post-install/xfce4-sensors-plugin::
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+%:
+	dh $@
+
+override_dh_auto_configure:
+	dh_auto_configure -- --enable-libsensors=yes --enable-procacpi --enable-hddtemp=yes --enable-notification
+
+override_dh_makeshlibs:
+	dh_makeshlibs  -X debian/xfce4-sensors-plugin/usr/lib/xfce4/modules/libxfce4sensors.so.*.*.*
+
+override_dh_auto_install:
+	dh_auto_install
 	rmdir debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/modules/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/modules/*.la
+	rm debian/`dh_listpackages`/usr/lib/xfce4/modules/*.a
+	rm debian/`dh_listpackages`/usr/lib/xfce4/modules/*.la

Added: goodies/trunk/xfce4-sensors-plugin/debian/xfce4-sensors-plugin.manpages
===================================================================
--- goodies/trunk/xfce4-sensors-plugin/debian/xfce4-sensors-plugin.manpages	                        (rev 0)
+++ goodies/trunk/xfce4-sensors-plugin/debian/xfce4-sensors-plugin.manpages	2011-06-14 07:04:24 UTC (rev 5788)
@@ -0,0 +1 @@
+debian/xfce4-sensors.1