Switch from cdbs to dh.

3 files changed, 42 insertions, 41 deletions

diff --git a/debian/changelog b/debian/changelog
index c54d9177..4dff261e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dbus (1.4.1-3) UNRELEASED; urgency=low
+
+  * Switch from cdbs to dh.
+
+ -- Michael Biebl <biebl@debian.org>  Sat, 12 Feb 2011 13:31:06 +0100
+
 dbus (1.4.1-2) unstable; urgency=low
 
   [ Simon McVittie ]
diff --git a/debian/control b/debian/control
index a4c04d29..e85564db 100644
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Uploaders: Sjoerd Simons <sjoerd@debian.org>,
            Michael Biebl <biebl@debian.org>,
            Loic Minier <lool@dooz.org>,
            Simon McVittie <smcv@debian.org>
-Build-Depends: cdbs (>= 0.4.43),
-               debhelper (>= 7),
+Build-Depends: debhelper (>= 8),
                autotools-dev,
                libexpat-dev,
                doxygen,
diff --git a/debian/rules b/debian/rules
index 7164c8ad..4e460773 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,60 +2,56 @@
 # Copyright © 2002,2003 Colin Walters <walters@verbum.org>
 # Copyright © 2003 Daniel Stone <daniels@debian.org>
 # Copyright © 2006 Sjoerd Simons <sjoerd@debian.org>
+# Copyright © 2011 Michael Biebl <biebl@debian.org>
 
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@
+
+export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 libdbusN := $(shell sed -rn 's/Package:[[:space:]]*(libdbus-[0-9-]+)[[:space:]]*$$/\1/p' debian/control | head -n 1)
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libdbusN) (>= 1.3.1)'
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-xml-docs \
+		--enable-doxygen-docs \
+		--disable-libaudit \
+		--libexecdir=\$${prefix}/lib/dbus-1.0 \
+		--with-systemdsystemunitdir=/lib/systemd/system
 
-LDFLAGS += -Wl,--as-needed
+override_dh_auto_build:
+	dh_auto_build
+	doxygen Doxyfile
+	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
 
-# List any files which are not installed
-common-binary-post-install-arch:: list-missing
+override_dh_link:
+	dh_link -plibdbus-1-dev lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so
+	dh_link --remaining-packages
 
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/dbus-1.0"
+override_dh_install:
+	dh_install
+	install -m 644 -D debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch
 
-DEB_CONFIGURE_EXTRA_FLAGS := \
-	--enable-xml-docs \
-	--enable-doxygen-docs \
-	--disable-libaudit \
-	--with-systemdsystemunitdir=/lib/systemd/system
+override_dh_installinit:
+	dh_installinit -pdbus -r -- start 12 2 3 4 5 .
 
-DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 .
+# we don't want docs for the debug symbols, just symlink to the library docs
+override_dh_installdocs:
+	dh_installdocs -pdbus-1-dbg --link-doc=$(libdbusN)
+	dh_installdocs --remaining-packages --all AUTHORS NEWS README
 
-binary-post-install/dbus-x11::
-	mkdir -p debian/dbus-x11/etc/X11/Xsession.d
-	cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch
+override_dh_strip:
+	dh_strip --dbg-package=dbus-1-dbg
 
-build/dbus-1-doc::
-	doxygen Doxyfile
-	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
-
-install/libdbus-1-dev::
-	dh_link -p$(cdbs_curpkg) lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so
+override_dh_makeshlibs:
+	dh_makeshlibs -V '$(libdbusN) (>= 1.3.1)'
 
-clean::
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -rf doc/api
 	rm -f test/data/valid-config-files/session.conf
 	rm -f test/data/valid-config-files/system.conf
 	rm -f doc/*.html
 	rm -f dbus.devhelp
 
-# we don't want docs for the debug symbols, just symlink to the library docs
-DEB_INSTALL_DOCS_ALL =
-DEB_INSTALL_DOCS_DEFAULT = README AUTHORS
-DEB_INSTALL_DOCS_dbus-1-dbg := --link-doc=$(libdbusN)
-DEB_INSTALL_CHANGELOGS_ALL =
-DEB_INSTALL_CHANGELOGS_DEFAULT = ChangeLog
-DEB_INSTALL_CHANGELOGS_dbus-1-dbg := --no-act
-
-# workaround for cdbs running dh-buildinfo (if installed) too early;
-# see #590594
-debian/stamp-buildinfo: insist-on-symlinks
-insist-on-symlinks:
-	@echo "regarding #590594, observe that this is before dh_installdocs"
-	install -d debian/dbus-1-dbg/usr/share/doc
-	ln -s $(libdbusN) debian/dbus-1-dbg/usr/share/doc/dbus-1-dbg
+