[Pkg-xfce-commits] r6846 - goodies/trunk/xfce4-systemload-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-04-22 07:50:18 +0000 (Sun, 22 Apr 2012)
New Revision: 6846

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

Modified: goodies/trunk/xfce4-systemload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/changelog	2012-04-22 07:41:49 UTC (rev 6845)
+++ goodies/trunk/xfce4-systemload-plugin/debian/changelog	2012-04-22 07:50:18 UTC (rev 6846)
@@ -3,6 +3,16 @@
   * New upstream release.
   * debian/control:
     - replace libxfcegui4 build-dep by libxfce4ui.
+    - drop cdbs and hardening-includes build-dep.
+    - update debhelper build-dep to 9.
+    - add dpkg-dev 1.16.1 build-dep.
+  * debian/rules:
+    - replace cdbs by dh(1).
+    - use --parallel.
+    - pass --disable-static to configure.
+    - use find to remove .la files
+    - use debhelper 9 and dpkg-dev 1.16.1 hardening support.
+  * debian/compat bumped to 9.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 22 Apr 2012 09:07:43 +0200
 

Modified: goodies/trunk/xfce4-systemload-plugin/debian/compat
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/compat	2012-04-22 07:41:49 UTC (rev 6845)
+++ goodies/trunk/xfce4-systemload-plugin/debian/compat	2012-04-22 07:50:18 UTC (rev 6846)
@@ -1 +1 @@
-7
+9

Modified: goodies/trunk/xfce4-systemload-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/control	2012-04-22 07:41:49 UTC (rev 6845)
+++ goodies/trunk/xfce4-systemload-plugin/debian/control	2012-04-22 07:50:18 UTC (rev 6846)
@@ -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),
+Build-Depends: autotools-dev, debhelper (>= 9), dpkg-dev (>= 1.16.1),
  xfce4-panel-dev (>= 4.8.0), libxml2-dev, libxml-parser-perl, libxfce4ui-1-dev,
- hardening-includes, intltool
+ intltool
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-systemload-plugin/

Modified: goodies/trunk/xfce4-systemload-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-systemload-plugin/debian/rules	2012-04-22 07:41:49 UTC (rev 6845)
+++ goodies/trunk/xfce4-systemload-plugin/debian/rules	2012-04-22 07:50:18 UTC (rev 6846)
@@ -1,17 +1,13 @@
 #!/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
+export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1 -Wl,-z,defs
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
 
-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)
+%:
+		dh $@ --parallel
 
-export CFLAGS LDFLAGS
+override_dh_auto_configure:
+		dh_auto_configure -- --disable-static
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-debug=yes
-
-binary-post-install/xfce4-systemload-plugin::
-	-rm -rf debian/xfce4-systemload-plugin/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/xfce4-systemload-plugin/usr/lib/xfce4/panel-plugins/*.la
+override_dh_auto_install:
+	dh_auto_install
+	find debian/xfce4-systemload-plugin/usr/lib -name '*.la' -delete