diff -u xfce4-genmon-plugin-3.0/debian/changelog xfce4-genmon-plugin-3.0/debian/changelog
--- xfce4-genmon-plugin-3.0/debian/changelog
+++ xfce4-genmon-plugin-3.0/debian/changelog
@@ -1,3 +1,10 @@
+xfce4-genmon-plugin (3.0-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Using our xfce.mk cdbs class
+
+ -- Cody A.W. Somerville <cody-somerville@ubuntu.com>  Thu, 25 Jan 2007 23:41:07 -0400
+
 xfce4-genmon-plugin (3.0-2) unstable; urgency=low
 
   (Yves-Alexis Perez)
@@ -7,6 +14,13 @@
 
  -- Yves-Alexis Perez <corsac@corsac.net>  Fri, 05 Jan 2007 16:43:35 +0100
 
+xfce4-genmon-plugin (3.0-1ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Use our xfce.mk cdbs class
+
+ -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Wed, 20 Dec 2006 12:36:20 +0100
+
 xfce4-genmon-plugin (3.0-1) unstable; urgency=low
 
   * New upstream release.
@@ -14,12 +28,26 @@
 
  -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 16 Nov 2006 18:31:29 +0100
 
+xfce4-genmon-plugin (2.0-2ubuntu1) feisty; urgency=low
+
+  * Merge from debian unstable:
+    - use our xfce.mk class
+
+ -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Mon, 11 Dec 2006 10:18:23 +0100
+
 xfce4-genmon-plugin (2.0-2) unstable; urgency=low
 
   * Incremented build-deps to 4.3.90.2 (Xfce 4.4 Beta2).
 
  -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 26 Jul 2006 17:48:57 +0100
 
+xfce4-genmon-plugin (2.0-1ubuntu1) edgy; urgency=low
+
+  * Merge wth debian unstable:
+     - use our cdbs xfce.mk class
+
+ -- Gauvain Pocentek <gauvainpocentek@ubuntu.com>  Tue, 25 Jul 2006 19:19:26 +0200
+
 xfce4-genmon-plugin (2.0-1) unstable; urgency=low
 
   * Initial Release.                                           closes: #309860
diff -u xfce4-genmon-plugin-3.0/debian/rules xfce4-genmon-plugin-3.0/debian/rules
--- xfce4-genmon-plugin-3.0/debian/rules
+++ xfce4-genmon-plugin-3.0/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/xfce.mk
 
 binary-post-install/xfce4-genmon-plugin::
 	-rm -rf debian/`dh_listpackages`/usr/lib/xfce4/panel-plugins/*.a