diff -u pmailq-0.1/debian/changelog pmailq-0.1/debian/changelog
--- pmailq-0.1/debian/changelog
+++ pmailq-0.1/debian/changelog
@@ -1,3 +1,9 @@
+pmailq (0.1-2) unstable; urgency=low
+
+  * Switch to cdbs. Maintenance made easy.
+
+ -- Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>  Wed, 28 Nov 2007 09:22:58 +0100
+
 pmailq (0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #453238)
diff -u pmailq-0.1/debian/control pmailq-0.1/debian/control
--- pmailq-0.1/debian/control
+++ pmailq-0.1/debian/control
@@ -2,7 +2,7 @@
 Section: admin
 Priority: extra
 Maintainer: Emmanuel Bouthenot <kolter@openics.org>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), cdbs
 Standards-Version: 3.7.2
 VCS-Browser: http://git.openics.org/?p=pmailq.git;a=summary
 VCS-Git: git://git.openics.org/pmailq.git
diff -u pmailq-0.1/debian/rules pmailq-0.1/debian/rules
--- pmailq-0.1/debian/rules
+++ pmailq-0.1/debian/rules
@@ -2,60 +2,8 @@
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+include /usr/share/cdbs/1/rules/debhelper.mk
 
-
-build: build-stamp
-
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
+build/pmailq::
 	$(MAKE)
 
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
+clean::
 	$(MAKE) clean
-
-	dh_clean 
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k 
-	dh_installdirs
-
-	# Install pmailq
-	cp pmailq $(CURDIR)/debian/pmailq/usr/sbin/
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs 
-	dh_installdocs
-#	dh_install
-	dh_installman
-	dh_link
-#	dh_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
only in patch2:
unchanged:
--- pmailq-0.1.orig/debian/install
+++ pmailq-0.1/debian/install
@@ -0,0 +1 @@
+pmailq	/usr/sbin