DEB ksensors: Switch to cmake

The man page has been moved to the main tree

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

22 files changed, 46 insertions, 442 deletions

diff --git a/debian/lenny/applications/ksensors/debian/cdbs/buildvars.mk b/debian/lenny/applications/ksensors/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/debian/lenny/applications/ksensors/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..32ba4acfb 100644
--- a/debian/lenny/applications/ksensors/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/ksensors/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)
@@ -103,6 +105,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 | \
@@ -111,6 +114,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/ksensors/debian/cdbs/kde.mk b/debian/lenny/applications/ksensors/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/lenny/applications/ksensors/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/ksensors/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/ksensors/debian/cdbs/uploaders.mk b/debian/lenny/applications/ksensors/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/lenny/applications/ksensors/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/lenny/applications/ksensors/debian/control b/debian/lenny/applications/ksensors/debian/control
index d9cfa54eb..7b31badb0 100644
--- a/debian/lenny/applications/ksensors/debian/control
+++ b/debian/lenny/applications/ksensors/debian/control
@@ -2,7 +2,7 @@ Source: ksensors-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3
 
diff --git a/debian/lenny/applications/ksensors/debian/dirs b/debian/lenny/applications/ksensors/debian/dirs
index f24c1cea3..cae0d6764 100644
--- a/debian/lenny/applications/ksensors/debian/dirs
+++ b/debian/lenny/applications/ksensors/debian/dirs
@@ -1,3 +1,2 @@
-usr/share/lintian/overrides
 opt/trinity/share/pixmaps
 opt/trinity/share/sounds
diff --git a/debian/lenny/applications/ksensors/debian/docs b/debian/lenny/applications/ksensors/debian/docs
index f4efe9c7f..e31aa157a 100644
--- a/debian/lenny/applications/ksensors/debian/docs
+++ b/debian/lenny/applications/ksensors/debian/docs
@@ -1,5 +1,7 @@
+AUTHORS
 LEEME
 LIESMICH
 LISEZMOI
+NEWS
 README
 TODO
diff --git a/debian/lenny/applications/ksensors/debian/ksensors.1 b/debian/lenny/applications/ksensors/debian/ksensors.1
deleted file mode 100644
index d4da2cf30..000000000
--- a/debian/lenny/applications/ksensors/debian/ksensors.1
+++ /dev/null
@@ -1,62 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSENSORS 1 "May 02, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksensors \- lm-sensors frontend for TDE 
-.SH SYNOPSIS
-.B ksensors
-.RI "[ options ]"
-.SH DESCRIPTION
-.B KSensors
-is a lm-sensors frontend for TDE for monitoring a motherboard.
-It allows you to access information from temperature and fan
-speed sensors.
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-nodock
-Don't dock in TDE system tray.
-.TP
-.B \-\-splash
-Show splash screen.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show license information
-.SH AUTHOR
-.B KSensors
-was written by Miguel Novas <michaell@teleline.es>.
-.br
-This manual page was written by Aurelien Jarno <aurel32@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/lenny/applications/ksensors/debian/manpages b/debian/lenny/applications/ksensors/debian/manpages
deleted file mode 100644
index a01059191..000000000
--- a/debian/lenny/applications/ksensors/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/ksensors.1
diff --git a/debian/lenny/applications/ksensors/debian/overrides b/debian/lenny/applications/ksensors/debian/overrides
deleted file mode 100644
index 35cd15549..000000000
--- a/debian/lenny/applications/ksensors/debian/overrides
+++ /dev/null
@@ -1 +0,0 @@
-ksensors-trinity: menu-item-contains-unknown-tag kderemove /usr/lib/menu/ksensors:8
diff --git a/debian/lenny/applications/ksensors/debian/rules b/debian/lenny/applications/ksensors/debian/rules
index 35f8c85c4..3859e56b5 100755
--- a/debian/lenny/applications/ksensors/debian/rules
+++ b/debian/lenny/applications/ksensors/debian/rules
@@ -1,50 +1,24 @@
 #!/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
-
-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
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -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"
 
 binary-install/ksensors-trinity::
-	install -D -p -m644 debian/overrides \
-	  debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
 	# Installing icons
 	/usr/bin/convert $(CURDIR)/src/pics/hi16-app-ksensors.png $(CURDIR)/debian/ksensors-trinity/opt/trinity/share/pixmaps/ksensors.xpm
-
-clean::
-	dh_testdir
-	[ ! -f Makefile ] || $(MAKE) clean distclean
-	-rm -f po/*.gmo
-	-rm -f config.log
-	-find $(CURDIR) -name Makefile.in -exec rm -f {} \;
-	rm -f debian/stamp-bootstrap
diff --git a/debian/squeeze/applications/ksensors/debian/cdbs/buildvars.mk b/debian/squeeze/applications/ksensors/debian/cdbs/buildvars.mk
deleted file mode 100644
index 23d4709dc..000000000
--- a/debian/squeeze/applications/ksensors/debian/cdbs/buildvars.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2002,2003 Colin Walters <walters@debian.org>
-# Description: Defines some useful variables, but no rules
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2, or (at
-# your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_rules_buildvars
-_cdbs_rules_buildvars = 1
-
-CDBS_VERSION = something
-
-# Common useful variables
-DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
-DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
-DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
-DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
-DEB_ISNATIVE := $(shell dpkg-parsechangelog | egrep '^Version:' | perl -ne 'print if not /^Version:\s*.*-/;')
-
-# Split into arch/indep packages
-ifneq ($(DEB_INDEP_PACKAGES),cdbs)
-DEB_INDEP_PACKAGES := $(filter-out $(DONT_BUILD), $(strip $(shell $(_cdbs_scripts_path)/list-packages indep)))
-DEB_ARCH_PACKAGES := $(filter-out $(DONT_BUILD), $(filter-out $(DEB_INDEP_PACKAGES),$(strip $(shell $(_cdbs_scripts_path)/list-packages same))))
-endif
-# Split into normal and udeb packages
-ifeq ($(DEB_UDEB_PACKAGES),)
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-DEB_UDEB_PACKAGES = $(filter-out $(DONT_BUILD),$(filter %-udeb, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-else
-DEB_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES), $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-endif
-# Too much bother for now.  If someone complains we'll fix it.
-#DEB_ARCH_UDEB_PACKAGES = $(filter %-udeb, $(DEB_ARCH_PACKAGES))
-#DEB_INDEP_UDEB_PACKAGES = $(filter %-udeb, $(DEB_INDEP_PACKAGES))
-# A handy list of every package, udeb or not
-DEB_ALL_PACKAGES = $(filter-out $(DONT_BUILD),$(DEB_PACKAGES) $(DEB_UDEB_PACKAGES))
-DEB_INDEP_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_INDEP_PACKAGES)))
-DEB_ARCH_REGULAR_PACKAGES = $(filter-out $(DONT_BUILD), $(filter-out $(DEB_UDEB_PACKAGES),$(DEB_ARCH_PACKAGES)))
-
-DEB_DBG_PACKAGES = $(filter-out $(DONT_BUILD), $(filter %-dbg, $(DEB_ARCH_PACKAGES) $(DEB_INDEP_PACKAGES)))
-
-# Some support for srcdir != builddir builds.
-# These are relative to the root of the package
-DEB_SRCDIR ?= .
-DEB_BUILDDIR ?= $(strip $(DEB_SRCDIR))
-
-# Miscellaneous bits
-DEB_ARCH = $(shell dpkg --print-architecture)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-DEB_HOST_GNU_CPU ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_GNU_SYSTEM ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
-DEB_BUILD_GNU_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_CPU)
-DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
-DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH_OS ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_OS)
-
-ifeq ($(words $(DEB_ALL_PACKAGES)),1)
-	DEB_DESTDIR = $(CURDIR)/debian/$(strip $(DEB_ALL_PACKAGES))/
-else
-	DEB_DESTDIR = $(CURDIR)/debian/tmp/
-endif
-
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.23-1.1)
-
-endif
diff --git a/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk b/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk
index b4b889c6d..32ba4acfb 100644
--- a/debian/squeeze/applications/ksensors/debian/cdbs/debian-qt-kde.mk
+++ b/debian/squeeze/applications/ksensors/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)
@@ -103,6 +105,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 | \
@@ -111,6 +114,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/ksensors/debian/cdbs/kde.mk b/debian/squeeze/applications/ksensors/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/debian/squeeze/applications/ksensors/debian/cdbs/kde.mk
+++ b/debian/squeeze/applications/ksensors/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/ksensors/debian/cdbs/uploaders.mk b/debian/squeeze/applications/ksensors/debian/cdbs/uploaders.mk
deleted file mode 100644
index 31adfe31e..000000000
--- a/debian/squeeze/applications/ksensors/debian/cdbs/uploaders.mk
+++ /dev/null
@@ -1,29 +0,0 @@
-
-MAINTAINER=Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-UPLOADERS=$(shell grep -e +++ -e "^ -- " debian/changelog  | grep -v "debian-qt-kde@lists.debian.org" | head -13 | /bin/sed 's/^\s*//;s/\s*$$//;s/^+++\? Changes by //;s/^+++\? //;s/-- //;s/:$$//;s/ <.*//' | sort -u | while read line ; do grep "$$line" debian/cdbs/team-members ; done | tr "\n" ", " | sed 's/,/, /g;s/, $$//')
-
-
-debian/control.tmp:
-	@if [ ! -e debian/control.in ] ; then  \
-		echo "this package is not yet prepared for using automatic update of uploaders"; \
-		echo "Please do so."; \
-		exit 1; \
-	fi
-	@sed  's/@@@UPLOADERS@@@/$(UPLOADERS)/;s#@@@MAINTAINER@@@#$(MAINTAINER)#' debian/control.in  > debian/control.tmp
-
-check-uploaders: debian/control.tmp
-	@if ! diff -q debian/control debian/control.tmp ; then \
-		echo "WARNING:: Control file differs from manually generated one" ; \
-		echo "WARNING:: Please update it manually and check it afterwards" ; \
-		echo "WARNING:: Uploaders are updated by debian/rules update-uploaders" ;\
-		echo "WARNING:: If this is a binNMU, NMU or security upload, just ignore" ;\
-	fi
-	
-
-clean:: 
-	rm -f debian/control.tmp
-
-update-uploaders: debian/control.tmp
-	@mv -f debian/control.tmp debian/control
-
-makebuilddir:: check-uploaders
diff --git a/debian/squeeze/applications/ksensors/debian/control b/debian/squeeze/applications/ksensors/debian/control
index d9cfa54eb..7b31badb0 100644
--- a/debian/squeeze/applications/ksensors/debian/control
+++ b/debian/squeeze/applications/ksensors/debian/control
@@ -2,7 +2,7 @@ Source: ksensors-trinity
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, autotools-dev, automake, autoconf, libtool, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, libsensors4-dev, tdelibs14-trinity-dev, imagemagick
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.8.3
 
diff --git a/debian/squeeze/applications/ksensors/debian/dirs b/debian/squeeze/applications/ksensors/debian/dirs
index f24c1cea3..cae0d6764 100644
--- a/debian/squeeze/applications/ksensors/debian/dirs
+++ b/debian/squeeze/applications/ksensors/debian/dirs
@@ -1,3 +1,2 @@
-usr/share/lintian/overrides
 opt/trinity/share/pixmaps
 opt/trinity/share/sounds
diff --git a/debian/squeeze/applications/ksensors/debian/docs b/debian/squeeze/applications/ksensors/debian/docs
index f4efe9c7f..e31aa157a 100644
--- a/debian/squeeze/applications/ksensors/debian/docs
+++ b/debian/squeeze/applications/ksensors/debian/docs
@@ -1,5 +1,7 @@
+AUTHORS
 LEEME
 LIESMICH
 LISEZMOI
+NEWS
 README
 TODO
diff --git a/debian/squeeze/applications/ksensors/debian/ksensors.1 b/debian/squeeze/applications/ksensors/debian/ksensors.1
deleted file mode 100644
index d4da2cf30..000000000
--- a/debian/squeeze/applications/ksensors/debian/ksensors.1
+++ /dev/null
@@ -1,62 +0,0 @@
-.\"                                      Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH KSENSORS 1 "May 02, 2002"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh        disable hyphenation
-.\" .hy        enable hyphenation
-.\" .ad l      left justify
-.\" .ad b      justify to both left and right margins
-.\" .nf        disable filling
-.\" .fi        enable filling
-.\" .br        insert line break
-.\" .sp <n>    insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ksensors \- lm-sensors frontend for TDE 
-.SH SYNOPSIS
-.B ksensors
-.RI "[ options ]"
-.SH DESCRIPTION
-.B KSensors
-is a lm-sensors frontend for TDE for monitoring a motherboard.
-It allows you to access information from temperature and fan
-speed sensors.
-.SH OPTIONS
-A summary of options are included below.
-.TP
-.B \-\-nodock
-Don't dock in TDE system tray.
-.TP
-.B \-\-splash
-Show splash screen.
-.TP
-.B \-\-help
-Show summary of options.
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-tde
-Show TDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v, \-\-version
-Show version of program.
-.TP
-.B \-\-license
-Show license information
-.SH AUTHOR
-.B KSensors
-was written by Miguel Novas <michaell@teleline.es>.
-.br
-This manual page was written by Aurelien Jarno <aurel32@debian.org>,
-for the Debian GNU/Linux system (but may be used by others).
diff --git a/debian/squeeze/applications/ksensors/debian/manpages b/debian/squeeze/applications/ksensors/debian/manpages
deleted file mode 100644
index a01059191..000000000
--- a/debian/squeeze/applications/ksensors/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/ksensors.1
diff --git a/debian/squeeze/applications/ksensors/debian/overrides b/debian/squeeze/applications/ksensors/debian/overrides
deleted file mode 100644
index 35cd15549..000000000
--- a/debian/squeeze/applications/ksensors/debian/overrides
+++ /dev/null
@@ -1 +0,0 @@
-ksensors-trinity: menu-item-contains-unknown-tag kderemove /usr/lib/menu/ksensors:8
diff --git a/debian/squeeze/applications/ksensors/debian/rules b/debian/squeeze/applications/ksensors/debian/rules
index fcb4eebc3..00e4d7fb4 100755
--- a/debian/squeeze/applications/ksensors/debian/rules
+++ b/debian/squeeze/applications/ksensors/debian/rules
@@ -1,50 +1,24 @@
 #!/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
-
-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
-
-	autoreconf --install && automake -f && \
-	$(MAKE) -f admin/Makefile.common && \
-	touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc/trinity" \
+ -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"
 
 binary-install/ksensors-trinity::
-	install -D -p -m644 debian/overrides \
-	  debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg)
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
 	# Installing icons
 	/usr/bin/convert $(CURDIR)/src/pics/hi16-app-ksensors.png $(CURDIR)/debian/ksensors-trinity/opt/trinity/share/pixmaps/ksensors.xpm
-
-clean::
-	dh_testdir
-	[ ! -f Makefile ] || $(MAKE) clean distclean
-	-rm -f po/*.gmo
-	-rm -f config.log
-	-find $(CURDIR) -name Makefile.in -exec rm -f {} \;
-	rm -f debian/stamp-bootstrap