DEB kasablanca: Switch to cmake.

The man page has been moved to the main tree.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 96097b13a4075e119a869bdb08ad0f8588261110)

24 files changed, 69 insertions, 573 deletions

diff --git a/debian/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/debian/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/debian/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/cdbs/kde.mk b/debian/_base/applications/kasablanca/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/debian/_base/applications/kasablanca/debian/cdbs/kde.mk
+++ b/debian/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/control b/debian/_base/applications/kasablanca/debian/control
index 2ae39fb54..0b67cb4fd 100644
--- a/debian/_base/applications/kasablanca/debian/control
+++ b/debian/_base/applications/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: kasablanca-trinity
diff --git a/debian/_base/applications/kasablanca/debian/docs b/debian/_base/applications/kasablanca/debian/docs
index 1333ed77b..c17f03764 100644
--- a/debian/_base/applications/kasablanca/debian/docs
+++ b/debian/_base/applications/kasablanca/debian/docs
@@ -1 +1,4 @@
+AUTHORS
+NEWS
+README
 TODO
diff --git a/debian/_base/applications/kasablanca/debian/kasablanca.xml b/debian/_base/applications/kasablanca/debian/kasablanca.xml
deleted file mode 100644
index 5f142fd2b..000000000
--- a/debian/_base/applications/kasablanca/debian/kasablanca.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY dhfirstname "<firstname>Fathi</firstname>">
-  <!ENTITY dhsurname   "<surname>Boudra</surname>">
-  <!ENTITY dhdate      "<date>mars 22, 2006</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>fboudra@free.fr</email>">
-  <!ENTITY dhusername  "Fathi Boudra">
-  <!ENTITY dhucpackage "<refentrytitle>kasablanca</refentrytitle>">
-  <!ENTITY dhpackage   "kasablanca">
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>fast and free ftp client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable>options</replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> is an ftp client, written in c++, using the tde libraries.</para>
-
-    <para>Features:
-      <simplelist>
-        <member>* ftps encryption via AUTH TLS</member>
-        <member>* fxp (direct server to server transfer), supporting alternative mode</member>
-        <member>* advanced bookmarking system</member>
-        <member>* fast responsive multithreaded engine</member>
-        <member>* concurrent connections to multiple hosts</member>
-        <member>* interactive transfer queue, movable by drag and drop</member>
-        <member>* small nifty features, like a skiplist</member>
-      </simplelist>
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>All TDE and Qt programs accept some common command-line options.
-    <command>&dhpackage;</command> has no application-specific options.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show help about options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-qt</option>
-        </term>
-        <listitem>
-          <para>Show Qt specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-tde</option>
-        </term>
-        <listitem>
-          <para>Show TDE specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-all</option>
-        </term>
-        <listitem>
-          <para>Show all options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--author</option>
-        </term>
-        <listitem>
-          <para>Show author information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--license</option>
-        </term>
-        <listitem>
-          <para>Show license information</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/debian/_base/applications/kasablanca/debian/manpages b/debian/_base/applications/kasablanca/debian/manpages
deleted file mode 100644
index 8ae2d25f3..000000000
--- a/debian/_base/applications/kasablanca/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-kasablanca.1
diff --git a/debian/_base/applications/kasablanca/debian/rules b/debian/_base/applications/kasablanca/debian/rules
index da587ae58..e5c16cf8a 100755
--- a/debian/_base/applications/kasablanca/debian/rules
+++ b/debian/_base/applications/kasablanca/debian/rules
@@ -1,45 +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
-
-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
-
-build/kasablanca-trinity::
-	/usr/bin/docbook2x-man debian/kasablanca.xml
-
-binary-install/kasablanca-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	dh_testdir
-	rm -f kasablanca.1
-	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/_base/applications/kasablanca/debian/source.lintian-overrides b/debian/_base/applications/kasablanca/debian/source.lintian-overrides
deleted file mode 100644
index 7349addb4..000000000
--- a/debian/_base/applications/kasablanca/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Upstream distributes it like this ATM but cleans it in next release
-kasablanca-trinity source: source-contains-CVS-dir admin/CVS
diff --git a/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/debian/lenny/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/debian/lenny/applications/kasablanca/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/kasablanca/debian/cdbs/kde.mk b/debian/lenny/applications/kasablanca/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/debian/lenny/applications/kasablanca/debian/cdbs/kde.mk
+++ b/debian/lenny/applications/kasablanca/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/kasablanca/debian/control b/debian/lenny/applications/kasablanca/debian/control
index 2ae39fb54..0b67cb4fd 100644
--- a/debian/lenny/applications/kasablanca/debian/control
+++ b/debian/lenny/applications/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: kasablanca-trinity
diff --git a/debian/lenny/applications/kasablanca/debian/docs b/debian/lenny/applications/kasablanca/debian/docs
index 1333ed77b..c17f03764 100644
--- a/debian/lenny/applications/kasablanca/debian/docs
+++ b/debian/lenny/applications/kasablanca/debian/docs
@@ -1 +1,4 @@
+AUTHORS
+NEWS
+README
 TODO
diff --git a/debian/lenny/applications/kasablanca/debian/kasablanca.xml b/debian/lenny/applications/kasablanca/debian/kasablanca.xml
deleted file mode 100644
index 5f142fd2b..000000000
--- a/debian/lenny/applications/kasablanca/debian/kasablanca.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY dhfirstname "<firstname>Fathi</firstname>">
-  <!ENTITY dhsurname   "<surname>Boudra</surname>">
-  <!ENTITY dhdate      "<date>mars 22, 2006</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>fboudra@free.fr</email>">
-  <!ENTITY dhusername  "Fathi Boudra">
-  <!ENTITY dhucpackage "<refentrytitle>kasablanca</refentrytitle>">
-  <!ENTITY dhpackage   "kasablanca">
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>fast and free ftp client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable>options</replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> is an ftp client, written in c++, using the tde libraries.</para>
-
-    <para>Features:
-      <simplelist>
-        <member>* ftps encryption via AUTH TLS</member>
-        <member>* fxp (direct server to server transfer), supporting alternative mode</member>
-        <member>* advanced bookmarking system</member>
-        <member>* fast responsive multithreaded engine</member>
-        <member>* concurrent connections to multiple hosts</member>
-        <member>* interactive transfer queue, movable by drag and drop</member>
-        <member>* small nifty features, like a skiplist</member>
-      </simplelist>
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>All TDE and Qt programs accept some common command-line options.
-    <command>&dhpackage;</command> has no application-specific options.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show help about options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-qt</option>
-        </term>
-        <listitem>
-          <para>Show Qt specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-tde</option>
-        </term>
-        <listitem>
-          <para>Show TDE specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-all</option>
-        </term>
-        <listitem>
-          <para>Show all options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--author</option>
-        </term>
-        <listitem>
-          <para>Show author information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--license</option>
-        </term>
-        <listitem>
-          <para>Show license information</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/debian/lenny/applications/kasablanca/debian/manpages b/debian/lenny/applications/kasablanca/debian/manpages
deleted file mode 100644
index 8ae2d25f3..000000000
--- a/debian/lenny/applications/kasablanca/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-kasablanca.1
diff --git a/debian/lenny/applications/kasablanca/debian/rules b/debian/lenny/applications/kasablanca/debian/rules
index db4c7b6c0..4a317e325 100755
--- a/debian/lenny/applications/kasablanca/debian/rules
+++ b/debian/lenny/applications/kasablanca/debian/rules
@@ -1,45 +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
-
-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
-
-build/kasablanca-trinity::
-	/usr/bin/docbook2x-man debian/kasablanca.xml
-
-binary-install/kasablanca-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	dh_testdir
-	rm -f kasablanca.1
-	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/lenny/applications/kasablanca/debian/source.lintian-overrides b/debian/lenny/applications/kasablanca/debian/source.lintian-overrides
deleted file mode 100644
index 7349addb4..000000000
--- a/debian/lenny/applications/kasablanca/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Upstream distributes it like this ATM but cleans it in next release
-kasablanca-trinity source: source-contains-CVS-dir admin/CVS
diff --git a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
index 9f8f97776..60310a01a 100644
--- a/ubuntu/_base/applications/kasablanca/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/cdbs/kde.mk b/ubuntu/_base/applications/kasablanca/debian/cdbs/kde.mk
index 1ac26c4b7..80176d63e 100644
--- a/ubuntu/_base/applications/kasablanca/debian/cdbs/kde.mk
+++ b/ubuntu/_base/applications/kasablanca/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/_base/applications/kasablanca/debian/control b/ubuntu/_base/applications/kasablanca/debian/control
index 2ae39fb54..0b67cb4fd 100644
--- a/ubuntu/_base/applications/kasablanca/debian/control
+++ b/ubuntu/_base/applications/kasablanca/debian/control
@@ -3,7 +3,7 @@ Section: tde
 Priority: optional
 Maintainer: Debian TDE Extras Team <pkg-tde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, automake, libtool, tdelibs14-trinity-dev, docbook2x, docbook-xml
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: kasablanca-trinity
diff --git a/ubuntu/_base/applications/kasablanca/debian/docs b/ubuntu/_base/applications/kasablanca/debian/docs
index 1333ed77b..c17f03764 100644
--- a/ubuntu/_base/applications/kasablanca/debian/docs
+++ b/ubuntu/_base/applications/kasablanca/debian/docs
@@ -1 +1,4 @@
+AUTHORS
+NEWS
+README
 TODO
diff --git a/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml b/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml
deleted file mode 100644
index 5f142fd2b..000000000
--- a/ubuntu/_base/applications/kasablanca/debian/kasablanca.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-  <!ENTITY dhfirstname "<firstname>Fathi</firstname>">
-  <!ENTITY dhsurname   "<surname>Boudra</surname>">
-  <!ENTITY dhdate      "<date>mars 22, 2006</date>">
-  <!ENTITY dhsection   "<manvolnum>1</manvolnum>">
-  <!ENTITY dhemail     "<email>fboudra@free.fr</email>">
-  <!ENTITY dhusername  "Fathi Boudra">
-  <!ENTITY dhucpackage "<refentrytitle>kasablanca</refentrytitle>">
-  <!ENTITY dhpackage   "kasablanca">
-  <!ENTITY debian      "<productname>Debian</productname>">
-  <!ENTITY gnu         "<acronym>GNU</acronym>">
-  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
-]>
-
-<refentry>
-  <refentryinfo>
-    <address>
-      &dhemail;
-    </address>
-    <author>
-      &dhfirstname;
-      &dhsurname;
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>&dhusername;</holder>
-    </copyright>
-    &dhdate;
-  </refentryinfo>
-  <refmeta>
-    &dhucpackage;
-
-    &dhsection;
-  </refmeta>
-  <refnamediv>
-    <refname>&dhpackage;</refname>
-
-    <refpurpose>fast and free ftp client for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>&dhpackage;</command>
-
-      <arg><option><replaceable>options</replaceable></option></arg>
-
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-
-    <para><command>&dhpackage;</command> is an ftp client, written in c++, using the tde libraries.</para>
-
-    <para>Features:
-      <simplelist>
-        <member>* ftps encryption via AUTH TLS</member>
-        <member>* fxp (direct server to server transfer), supporting alternative mode</member>
-        <member>* advanced bookmarking system</member>
-        <member>* fast responsive multithreaded engine</member>
-        <member>* concurrent connections to multiple hosts</member>
-        <member>* interactive transfer queue, movable by drag and drop</member>
-        <member>* small nifty features, like a skiplist</member>
-      </simplelist>
-    </para>
-
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-
-    <para>All TDE and Qt programs accept some common command-line options.
-    <command>&dhpackage;</command> has no application-specific options.</para>
-
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>--help</option>
-        </term>
-        <listitem>
-          <para>Show help about options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-qt</option>
-        </term>
-        <listitem>
-          <para>Show Qt specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-tde</option>
-        </term>
-        <listitem>
-          <para>Show TDE specific options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--help-all</option>
-        </term>
-        <listitem>
-          <para>Show all options</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--author</option>
-        </term>
-        <listitem>
-          <para>Show author information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><option>-v</option>
-          <option>--version</option>
-        </term>
-        <listitem>
-          <para>Show version information</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>--license</option>
-        </term>
-        <listitem>
-          <para>Show license information</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
-    <title>AUTHOR</title>
-
-    <para>This manual page was written by &dhusername; &lt;&dhemail;&gt; for
-      the &debian; system (but may be used by others).  Permission is
-      granted to copy, distribute and/or modify this document under
-      the terms of the &gnu; General Public License, Version 2 any 
-	  later version published by the Free Software Foundation.
-    </para>
-	<para>
-	  On Debian systems, the complete text of the GNU General Public
-	  License can be found in /usr/share/common-licenses/GPL.
-	</para>
-
-  </refsect1>
-</refentry>
-
diff --git a/ubuntu/_base/applications/kasablanca/debian/manpages b/ubuntu/_base/applications/kasablanca/debian/manpages
deleted file mode 100644
index 8ae2d25f3..000000000
--- a/ubuntu/_base/applications/kasablanca/debian/manpages
+++ /dev/null
@@ -1 +0,0 @@
-kasablanca.1
diff --git a/ubuntu/_base/applications/kasablanca/debian/rules b/ubuntu/_base/applications/kasablanca/debian/rules
index da587ae58..e5c16cf8a 100755
--- a/ubuntu/_base/applications/kasablanca/debian/rules
+++ b/ubuntu/_base/applications/kasablanca/debian/rules
@@ -1,45 +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
-
-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
-
-build/kasablanca-trinity::
-	/usr/bin/docbook2x-man debian/kasablanca.xml
-
-binary-install/kasablanca-trinity::
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	dh_testdir
-	rm -f kasablanca.1
-	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/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides b/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides
deleted file mode 100644
index 7349addb4..000000000
--- a/ubuntu/_base/applications/kasablanca/debian/source.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Upstream distributes it like this ATM but cleans it in next release
-kasablanca-trinity source: source-contains-CVS-dir admin/CVS