[Pkg-xfce-commits] r5897 - goodies/trunk/xfce4-netload-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-07-31 15:37:24 +0000 (Sun, 31 Jul 2011)
New Revision: 5897

Modified:
   goodies/trunk/xfce4-netload-plugin/debian/changelog
   goodies/trunk/xfce4-netload-plugin/debian/control
   goodies/trunk/xfce4-netload-plugin/debian/rules
Log:
* debian/rules:
  - switch to dh tiny rules.
* debian/control:
  - drop build-dep on cdbs.
  - add build-dep on debhelper >= 7.0.50~ for overrides.

Modified: goodies/trunk/xfce4-netload-plugin/debian/changelog
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/changelog	2011-07-31 15:35:35 UTC (rev 5896)
+++ goodies/trunk/xfce4-netload-plugin/debian/changelog	2011-07-31 15:37:24 UTC (rev 5897)
@@ -3,8 +3,13 @@
   * debian/patches:
     - 02_drop_ppp_headers added, fix FTBFS on kFreeBSD, thanks Guillem Jover.
                                                                 closes: #621820
+  * debian/rules:
+    - switch to dh tiny rules.
+  * debian/control:
+    - drop build-dep on cdbs.
+    - add build-dep on debhelper >= 7.0.50~ for overrides.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 31 Jul 2011 17:28:22 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 31 Jul 2011 17:30:39 +0200
 
 xfce4-netload-plugin (1.0.0-2) unstable; urgency=low
 

Modified: goodies/trunk/xfce4-netload-plugin/debian/control
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/control	2011-07-31 15:35:35 UTC (rev 5896)
+++ goodies/trunk/xfce4-netload-plugin/debian/control	2011-07-31 15:37:24 UTC (rev 5897)
@@ -3,7 +3,7 @@
 Priority: optional
 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), xfce4-panel-dev (>= 4.8.0), libxml2-dev,
+Build-Depends: debhelper (>= 7.0.50~), xfce4-panel-dev (>= 4.8.0), libxml2-dev,
  libxml-parser-perl, libxfcegui4-dev (>= 4.8.0), intltool, hardening-includes
 Standards-Version: 3.9.2
 Homepage: http://goodies.xfce.org/

Modified: goodies/trunk/xfce4-netload-plugin/debian/rules
===================================================================
--- goodies/trunk/xfce4-netload-plugin/debian/rules	2011-07-31 15:35:35 UTC (rev 5896)
+++ goodies/trunk/xfce4-netload-plugin/debian/rules	2011-07-31 15:37:24 UTC (rev 5897)
@@ -1,6 +1,4 @@
 #!/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
 
 LDFLAGS=$(shell dpkg-buildflags --get LDFLAGS)
@@ -10,6 +8,10 @@
 
 export CFLAGS LDFLAGS
 
-binary-post-install/xfce4-netload-plugin::
+override_dh_auto_install:
 	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.a
 	-rm -rf debian/xfce4-netload-plugin/usr/lib/xfce4/panel-plugins/*.la
+	dh_auto_install
+
+%:
+	dh $@