[Pkg-xfce-commits] r6833 - goodies/trunk/xfce4-battery-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-17 19:16:11 +0000 (Tue, 17 Apr 2012)
New Revision: 6833

Modified:
   goodies/trunk/xfce4-battery-plugin/debian/changelog
   goodies/trunk/xfce4-battery-plugin/debian/control
   goodies/trunk/xfce4-battery-plugin/debian/rules
Log:
* debian/rules:
  - use --parallel
  - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
  - pass --disable-static to configure.
  - use find to remove .la files.
* debian/compat bumped to 9.
* debian/control:
  - update debhelper build-dep to 9.
  - add dpkg-dev 1.16.1 build-dep.
  - drop hardening-includes build-dep.

Modified: goodies/trunk/xfce4-battery-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/changelog	2012-04-17 19:13:28 UTC (rev 6832)
+++ goodies/trunk/xfce4-battery-plugin/debian/changelog	2012-04-17 19:16:11 UTC (rev 6833)
@@ -5,6 +5,16 @@
 
   [ Yves-Alexis Perez ]
   * New upstream release.
+  * debian/rules:
+    - use --parallel
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+    - pass --disable-static to configure.
+    - use find to remove .la files.
+  * debian/compat bumped to 9.
+  * debian/control:
+    - update debhelper build-dep to 9.
+    - add dpkg-dev 1.16.1 build-dep.
+    - drop hardening-includes build-dep.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Tue, 17 Apr 2012 21:13:20 +0200
 

Modified: goodies/trunk/xfce4-battery-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/control	2012-04-17 19:13:28 UTC (rev 6832)
+++ goodies/trunk/xfce4-battery-plugin/debian/control	2012-04-17 19:16:11 UTC (rev 6833)
@@ -4,9 +4,9 @@
 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: autotools-dev, debhelper (>= 7.0.50~), libgtk2.0-dev,
+Build-Depends: autotools-dev, debhelper (>= 9), libgtk2.0-dev,
   xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl,
-  libxfce4util-dev, libxfcegui4-dev, intltool, hardening-includes
+  libxfce4util-dev, libxfcegui4-dev, intltool, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-battery-plugin/

Modified: goodies/trunk/xfce4-battery-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-battery-plugin/debian/rules	2012-04-17 19:13:28 UTC (rev 6832)
+++ goodies/trunk/xfce4-battery-plugin/debian/rules	2012-04-17 19:16:11 UTC (rev 6833)
@@ -1,17 +1,14 @@
 #!/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,-O1 -Wl,-z,defs -Wl,--as-needed
-CFLAGS+=$(HARDENING_CFLAGS)
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-export CFLAGS LDFLAGS
+%:
+	dh $@ --parallel
 
-override_dh_install:
-	rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.a
-	rm -rf debian/xfce4-battery-plugin/usr/lib/xfce4/panel-plugins/*.la
-	dh_install
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-static
 
-%:
-	dh $@
+override_dh_auto_install:
+	dh_auto_install
+	find debian/xfce4-battery-plugin/usr/lib -name '*.la' -delete