Move from cdbs to dh

* Move from cdbs to dh
  - Drop Build-Depends on cdbs.
  - Bump Build-Depends on debhelper to (>= 7.0.50~) for override targets.
  - Convert debian/rules to use dh.
  - Run autoreconf dh addon in debian/rules.

3 files changed, 16 insertions, 13 deletions

diff --git a/debian/changelog b/debian/changelog
index 75f8601..6c47e70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,12 +10,16 @@ consolekit (0.4.3-1) UNRELEASED; urgency=low
     - d/p/debian/patches/99-autoreconf.patch (use dh-autoreconf instead)
   * Use dh-autoreconf to update the build system
     - Add Build-Depends on dh-autoreconf.
-    - Add /usr/share/cdbs/1/rules/autoreconf.mk include in debian/rules.
+    - Run autoreconf dh addon in debian/rules.
   * Switch to source format 3.0 (quilt)
     - Add debian/source/format.
     - Drop quilt from Build-Depends.
     - Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk include.
     - Remove debian/README.source.
+  * Move from cdbs to dh
+    - Drop Build-Depends on cdbs.
+    - Bump Build-Depends on debhelper to (>= 7.0.50~) for override targets.
+    - Convert debian/rules to use dh.
 
  -- Michael Biebl <biebl@debian.org>  Wed, 17 Nov 2010 06:51:57 +0100
 
diff --git a/debian/control b/debian/control
index 80e8a67..db1812f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,7 @@ Section: admin
 Priority: optional
 Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
 Uploaders: Michael Biebl <biebl@debian.org>
-Build-Depends: cdbs,
- debhelper (>= 7),
+Build-Depends: debhelper (>= 7.0.50~),
  autotools-dev,
  pkg-config,
  libdbus-glib-1-dev (>= 0.30),
diff --git a/debian/rules b/debian/rules
index a4c5c9c..94a814f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
-  
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 
-DEB_CONFIGURE_LIBEXECDIR := "\$$(prefix)/lib/ConsoleKit"
+%:
+	dh $@ --with autoreconf
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-pam-module \
-                             --enable-docbook-docs \
-			     --with-pid-file=/var/run/console-kit-daemon.pid
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--libexecdir="\$$(prefix)/lib/ConsoleKit" \
+		--enable-pam-module \
+		--enable-docbook-docs \
+		--with-pid-file=/var/run/console-kit-daemon.pid
 
-install/consolekit::
+override_dh_auto_install:
+	dh_auto_install
 	install -m 755 debian/pam-foreground-compat.ck debian/tmp/usr/lib/ConsoleKit/run-session.d/
 	install -D -m 644 debian/libpam-ck-connector.pam-auth-update debian/tmp/usr/share/pam-configs/consolekit