[Pkg-xfce-commits] r5152 - goodies/branches/experimental/xfce4-genmon-plugin/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2011-03-23 15:57:44 +0000 (Wed, 23 Mar 2011)
New Revision: 5152

Modified:
   goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
   goodies/branches/experimental/xfce4-genmon-plugin/debian/control
   goodies/branches/experimental/xfce4-genmon-plugin/debian/rules
Log:
  - update debhelper build-dep for overrides support.
  - drop cdbs build-dep.
  - switch to debhelper 7 tiny.rules with overrides.

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:52:45 UTC (rev 5151)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/changelog	2011-03-23 15:57:44 UTC (rev 5152)
@@ -11,7 +11,8 @@
     - add build-dep on libxfcegui4-dev. 
     - update standards version to 3.9.1.
     - add ${misc:Depends} to dependencies.
-    - update debhelper build-dep to follow compat level.
+    - update debhelper build-dep for overrides support.
+    - drop cdbs build-dep.
     - add build-dep on hardening-includes.
   * debian/patches:
     - 01_no-zombies dropped, included upstream.
@@ -21,6 +22,7 @@
     - pick build flags from dpkg-buildflags.
     - add -z,defs, --as-needed and -O1 to LDFLAGS.
     - add hardening flags to build flags.
+    - switch to debhelper 7 tiny.rules with overrides.
   * Switch to 3.0 (quilt) source format
   * debian/compat bumped to 7.
 

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/control
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/control	2011-03-23 15:52:45 UTC (rev 5151)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/control	2011-03-23 15:57:44 UTC (rev 5152)
@@ -4,9 +4,8 @@
 Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
 Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>,
  Yves-Alexis Perez <corsac at debian.org>, Lionel Le Folgoc <mrpouit at gmail.com>
-Build-Depends: debhelper (>= 7), autotools-dev, cdbs, 
- xfce4-panel-dev (>= 4.4.1), libxml-parser-perl, libxfcegui4-dev, intltool,
- hardening-includes
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, xfce4-panel-dev (>= 4.4.1),
+ libxml-parser-perl, libxfcegui4-dev, intltool, hardening-includes
 Standards-Version: 3.9.1
 Homepage: http://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/xfce4-genmon-plugin/

Modified: goodies/branches/experimental/xfce4-genmon-plugin/debian/rules
===================================================================
--- goodies/branches/experimental/xfce4-genmon-plugin/debian/rules	2011-03-23 15:52:45 UTC (rev 5151)
+++ goodies/branches/experimental/xfce4-genmon-plugin/debian/rules	2011-03-23 15:57:44 UTC (rev 5152)
@@ -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-genmon-plugin::
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
-	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+override_dh_install:
+	rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a
+	rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.la
+	dh_install
+
+%:
+	dh $@