DEB kdbusnotification: Switch to cmake.

Switch to common TDE cdbs rules.

Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit d24bd898174453b586ac90f2ef7a60165fa26fde)

15 files changed, 66 insertions, 531 deletions

diff --git a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -110,6 +113,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/lenny/applications/kdbusnotification/debian/control b/debian/lenny/applications/kdbusnotification/debian/control
index a7698d2a8..ab18cace2 100644
--- a/debian/lenny/applications/kdbusnotification/debian/control
+++ b/debian/lenny/applications/kdbusnotification/debian/control
@@ -2,7 +2,7 @@ Source: kdbusnotification-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
 Standards-Version: 3.8.4
 
 Package: kdbusnotification-trinity
diff --git a/debian/lenny/applications/kdbusnotification/debian/links b/debian/lenny/applications/kdbusnotification/debian/links
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/lenny/applications/kdbusnotification/debian/links
+++ /dev/null
diff --git a/debian/lenny/applications/kdbusnotification/debian/rules b/debian/lenny/applications/kdbusnotification/debian/rules
index 9de7eb0d9..4a317e325 100755
--- a/debian/lenny/applications/kdbusnotification/debian/rules
+++ b/debian/lenny/applications/kdbusnotification/debian/rules
@@ -1,181 +1,20 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-INSTALL_DIR = install -p -d -o root -g root -m 755
-INSTALL_FILE = install -p -o root -g root -m 644
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
-tmp = debian/kdbusnotification-trinity
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
-  # Uncomment the following 2 lines to enable i686 optimziation
-  # You may want to tweak the settings to your likings
-  #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-  #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-endif
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -p /usr/share/misc/config.sub admin/config.sub
-	cp -p /usr/share/misc/config.guess admin/config.guess
-
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-	if test ! -f configure; then \
-		$(MAKE) -f admin/Makefile.common ;\
-	fi
-
-	# make build directory
-	mkdir $(objdir)
-
-	# run configure with build tree $(objdir)
-	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	cd $(objdir) && \
-	$(MAKE)
-
-	touch build-stamp
-
-debian-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
-
-	# Remove build tree
-	rm -rf $(objdir)
-
-	# if Makefile exists run distclean
-	if test -f Makefile; then \
-		$(MAKE) distclean; \
-	fi
-
-	if test -d CVS; then \
-		$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	fi
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kdbusnotification-trinity
-
-	# Install additional files beyond the standard install.
-	dh_install
-
-	# Generate HTML docs.
-	for i in `find $(tmp) -name "index.docbook"`; do \
-	  ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \
-	done
-
-	# Install standard documentation links.
-	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
-	      opt/trinity/share/doc/$$pkg/html; \
-	  fi; \
-	done
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmanpages
-	dh_installmime
-	dh_strip
-	dh_link
-	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-	# We have nothing to do by default.
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -110,6 +113,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/debian/squeeze/applications/kdbusnotification/debian/control b/debian/squeeze/applications/kdbusnotification/debian/control
index a7698d2a8..ab18cace2 100644
--- a/debian/squeeze/applications/kdbusnotification/debian/control
+++ b/debian/squeeze/applications/kdbusnotification/debian/control
@@ -2,7 +2,7 @@ Source: kdbusnotification-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
 Standards-Version: 3.8.4
 
 Package: kdbusnotification-trinity
diff --git a/debian/squeeze/applications/kdbusnotification/debian/links b/debian/squeeze/applications/kdbusnotification/debian/links
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/squeeze/applications/kdbusnotification/debian/links
+++ /dev/null
diff --git a/debian/squeeze/applications/kdbusnotification/debian/rules b/debian/squeeze/applications/kdbusnotification/debian/rules
index 9de7eb0d9..e5c16cf8a 100755
--- a/debian/squeeze/applications/kdbusnotification/debian/rules
+++ b/debian/squeeze/applications/kdbusnotification/debian/rules
@@ -1,181 +1,20 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-INSTALL_DIR = install -p -d -o root -g root -m 755
-INSTALL_FILE = install -p -o root -g root -m 644
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
-tmp = debian/kdbusnotification-trinity
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
-  # Uncomment the following 2 lines to enable i686 optimziation
-  # You may want to tweak the settings to your likings
-  #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-  #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-endif
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -p /usr/share/misc/config.sub admin/config.sub
-	cp -p /usr/share/misc/config.guess admin/config.guess
-
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-	if test ! -f configure; then \
-		$(MAKE) -f admin/Makefile.common ;\
-	fi
-
-	# make build directory
-	mkdir $(objdir)
-
-	# run configure with build tree $(objdir)
-	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	cd $(objdir) && \
-	$(MAKE)
-
-	touch build-stamp
-
-debian-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
-
-	# Remove build tree
-	rm -rf $(objdir)
-
-	# if Makefile exists run distclean
-	if test -f Makefile; then \
-		$(MAKE) distclean; \
-	fi
-
-	if test -d CVS; then \
-		$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	fi
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kdbusnotification-trinity
-
-	# Install additional files beyond the standard install.
-	dh_install
-
-	# Generate HTML docs.
-	for i in `find $(tmp) -name "index.docbook"`; do \
-	  ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \
-	done
-
-	# Install standard documentation links.
-	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
-	      opt/trinity/share/doc/$$pkg/html; \
-	  fi; \
-	done
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmanpages
-	dh_installmime
-	dh_strip
-	dh_link
-	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-	# We have nothing to do by default.
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
 # Note: This _must_ be included before autotools.mk, or it won't work.
 common-configure-arch common-configure-indep:: debian/stamp-cvs-make
 debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
 	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
 ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,6 +19,7 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
 	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
 endif
 	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
 	touch debian/stamp-cvs-make
 
 include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
@@ -102,6 +104,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
 	done
 
 clean::
+ifndef _cdbs_class_cmake
 	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
 		cd $(DEB_SRCDIR); \
 		find . -name Makefile.in -print | \
@@ -110,6 +113,7 @@ clean::
 			configure configure.files configure.in stamp-h.in \
 			subdirs; \
 	fi
+endif
 	rm -f debian/stamp-cvs-make
 
 endif
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
 DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
 endif
 
+ifndef _cdbs_class_cmake
 include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
 
 export kde_cgidir  = \$${libdir}/cgi-bin
 export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
 cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
 
 DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
 DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/control b/ubuntu/maverick/applications/kdbusnotification/debian/control
index a7698d2a8..ab18cace2 100644
--- a/ubuntu/maverick/applications/kdbusnotification/debian/control
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/control
@@ -2,7 +2,7 @@ Source: kdbusnotification-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libdbus-glib-1-dev, libgtk2.0-dev, libglib2.0-dev
 Standards-Version: 3.8.4
 
 Package: kdbusnotification-trinity
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/links b/ubuntu/maverick/applications/kdbusnotification/debian/links
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/maverick/applications/kdbusnotification/debian/links
+++ /dev/null
diff --git a/ubuntu/maverick/applications/kdbusnotification/debian/rules b/ubuntu/maverick/applications/kdbusnotification/debian/rules
index 9de7eb0d9..e5c16cf8a 100755
--- a/ubuntu/maverick/applications/kdbusnotification/debian/rules
+++ b/ubuntu/maverick/applications/kdbusnotification/debian/rules
@@ -1,181 +1,20 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
+#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-INSTALL_DIR = install -p -d -o root -g root -m 755
-INSTALL_FILE = install -p -o root -g root -m 644
-
-objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE)
-
-tmp = debian/kdbusnotification-trinity
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-ifeq ($(DEB_BUILD_GNU_TYPE),i386-linux)
-  # Uncomment the following 2 lines to enable i686 optimziation
-  # You may want to tweak the settings to your likings
-  #export CFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-  #export CXXFLAGS=-O3 -march=i686 -ffast-math -finline-functions
-endif
-
--include debian/debiandirs
-
-debian/debiandirs: admin/debianrules
-	perl -w admin/debianrules echodirs > debian/debiandirs
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
-	cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-	cp -p /usr/share/misc/config.sub admin/config.sub
-	cp -p /usr/share/misc/config.guess admin/config.guess
-
-	make -f admin/Makefile.common cvs
-	touch debian/stamp-bootstrap
-
-	if test ! -f configure; then \
-		$(MAKE) -f admin/Makefile.common ;\
-	fi
-
-	# make build directory
-	mkdir $(objdir)
-
-	# run configure with build tree $(objdir)
-	cd $(objdir) && \
-	../configure --disable-debug --enable-final --libexecdir=/opt/trinity/bin --sysconfdir=/etc --libdir=/opt/trinity/lib --includedir=/opt/include/tde --with-qt-includes=/usr/include/qt3 --mandir=/opt/trinity/share/man --infodir=/opt/trinity/share/info --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
-
-	touch configure-stamp
-
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	cd $(objdir) && \
-	$(MAKE)
-
-	touch build-stamp
-
-debian-clean:
-	dh_testdir
-	dh_testroot
-
-	dh_clean
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp debian/debiandirs
-
-	# Remove build tree
-	rm -rf $(objdir)
-
-	# if Makefile exists run distclean
-	if test -f Makefile; then \
-		$(MAKE) distclean; \
-	fi
-
-	if test -d CVS; then \
-		$(MAKE) -f admin/Makefile.common cvs-clean ;\
-	fi
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	cd $(objdir) && \
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/kdbusnotification-trinity
-
-	# Install additional files beyond the standard install.
-	dh_install
-
-	# Generate HTML docs.
-	for i in `find $(tmp) -name "index.docbook"`; do \
-	  ( cd `dirname $$i`; /opt/trinity/bin/meinproc `basename $$i` ); \
-	done
-
-	# Install standard documentation links.
-	for pkg in `dh_listpackages`; do \
-	  if test -d debian/$$pkg/opt/trinity/share/doc/tde/HTML/en/$$pkg; then \
-	    dh_link -p$$pkg opt/trinity/share/doc/tde/HTML/en/$$pkg \
-	      opt/trinity/share/doc/$$pkg/html; \
-	  fi; \
-	done
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installexamples
-	dh_installmanpages
-	dh_installmime
-	dh_strip
-	dh_link
-	dh_compress -X.docbook -X.css -X-license -X.dcl -X.bz2
-	dh_fixperms
-	dh_makeshlibs -V
-	dh_installdeb
-	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-	# We have nothing to do by default.
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-	$(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_VERBOSE_MAKEFILE="ON" \
+ -DCMAKE_SKIP_RPATH="OFF" \
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON"