6 files changed, 33 insertions, 63 deletions
diff --git a/debian/lenny/applications/kooldock/debian/control b/debian/lenny/applications/kooldock/debian/control
index eeb1e3a28..dd6b6b731 100644
--- a/debian/lenny/applications/kooldock/debian/control
+++ b/debian/lenny/applications/kooldock/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs-trinity-dev
 Standards-Version: 3.8.0
 Homepage: http://sourceforge.net/projects/kooldock/
 
diff --git a/debian/lenny/applications/kooldock/debian/docs b/debian/lenny/applications/kooldock/debian/docs
index 724e08449..c17f03764 100644
--- a/debian/lenny/applications/kooldock/debian/docs
+++ b/debian/lenny/applications/kooldock/debian/docs
@@ -1,2 +1,4 @@
+AUTHORS
+NEWS
 README
 TODO
diff --git a/debian/lenny/applications/kooldock/debian/rules b/debian/lenny/applications/kooldock/debian/rules
index 80d3fb248..4a317e325 100755
--- a/debian/lenny/applications/kooldock/debian/rules
+++ b/debian/lenny/applications/kooldock/debian/rules
@@ -1,37 +1,20 @@
 #!/usr/bin/make -f
- 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
-#include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+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)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-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
-
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f debian/stamp-bootstrap
+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/kooldock/debian/control b/debian/squeeze/applications/kooldock/debian/control
index eeb1e3a28..dd6b6b731 100644
--- a/debian/squeeze/applications/kooldock/debian/control
+++ b/debian/squeeze/applications/kooldock/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs-trinity-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs-trinity-dev
 Standards-Version: 3.8.0
 Homepage: http://sourceforge.net/projects/kooldock/
 
diff --git a/debian/squeeze/applications/kooldock/debian/docs b/debian/squeeze/applications/kooldock/debian/docs
index 724e08449..c17f03764 100644
--- a/debian/squeeze/applications/kooldock/debian/docs
+++ b/debian/squeeze/applications/kooldock/debian/docs
@@ -1,2 +1,4 @@
+AUTHORS
+NEWS
 README
 TODO
diff --git a/debian/squeeze/applications/kooldock/debian/rules b/debian/squeeze/applications/kooldock/debian/rules
index 80d3fb248..e5c16cf8a 100755
--- a/debian/squeeze/applications/kooldock/debian/rules
+++ b/debian/squeeze/applications/kooldock/debian/rules
@@ -1,37 +1,20 @@
 #!/usr/bin/make -f
- 
+
 include /usr/share/cdbs/1/rules/debhelper.mk
-include debian/cdbs/kde.mk
+include /usr/share/cdbs/1/class/cmake.mk
 #include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
-
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
+include debian/cdbs/debian-qt-kde.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-	dh_testdir
-
-	# Regenerate build system
-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
-
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
-
-clean::
-	rm -f debian/stamp-bootstrap
+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"