4 files changed, 18 insertions, 17 deletions
diff --git a/ubuntu/_base/applications/tork/debian/control b/ubuntu/_base/applications/tork/debian/control
index 4f6089f2a..08e642304 100644
--- a/ubuntu/_base/applications/tork/debian/control
+++ b/ubuntu/_base/applications/tork/debian/control
@@ -3,10 +3,7 @@ Section: tde
 Priority: optional
 Homepage: http://tork.sourceforge.net/
 Maintainer: TDE Debian Team <[email protected]>
-Build-Depends: debhelper (>= 9~), cdbs, automake, libtool, 
- tdelibs-trinity-dev, libgeoip-dev,
- libjpeg-dev, libpng-dev, zlib1g-dev,
- pkg-config, torsocks
+Build-Depends: debhelper (>= 9~), quilt, cdbs, cmake, tdelibs-trinity-dev, pkg-config, torsocks, libgeoip-dev, libssl-dev
 Standards-Version: 3.9.1
 
 Package: tork-trinity
diff --git a/ubuntu/_base/applications/tork/debian/rules b/ubuntu/_base/applications/tork/debian/rules
index 232394751..4d427949d 100755
--- a/ubuntu/_base/applications/tork/debian/rules
+++ b/ubuntu/_base/applications/tork/debian/rules
@@ -1,21 +1,27 @@
 #!/usr/bin/make -f
 
-# Currently is not possible to build piklab with --enable-final
-DEB_BUILD_OPTIONS += noopt
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.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
-
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -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"
+
 install/tork-trinity::
+	dh_testdir
 	mkdir -p debian/tmp/usr/share/menu
-	sed "s|package(tork)|package(tork-trinity)|" \
+	sed "s|package(tork)|package($(cdbs_curpkg))|" \
 	    <debian/tmp/opt/trinity/share/menu/tork \
-	    >debian/tmp/usr/share/menu/tork-trinity
+	    >debian/tmp/usr/share/menu/$(cdbs_curpkg)
diff --git a/ubuntu/_base/applications/tork/debian/tork-trinity.install b/ubuntu/_base/applications/tork/debian/tork-trinity.install
index ff343137a..04ff9c969 100644
--- a/ubuntu/_base/applications/tork/debian/tork-trinity.install
+++ b/ubuntu/_base/applications/tork/debian/tork-trinity.install
@@ -2,6 +2,6 @@ debian/tmp/opt/trinity/bin/*
 debian/tmp/usr/share/menu/tork-trinity
 debian/tmp/opt/trinity/share/pixmaps/tork.xpm
 debian/tmp/opt/trinity/share/man/*
-debian/tmp/opt/trinity/share/apps/tork/icons/hicolor/48x48/apps/tork.png opt/trinity/share/icons/hicolor/48x48/apps
+debian/tmp/opt/trinity/share/icons/*
 debian/tmp/opt/trinity/share/applications/*
 debian/tmp/opt/trinity/share/apps/konqueror/*
diff --git a/ubuntu/_base/applications/tork/debian/watch b/ubuntu/_base/applications/tork/debian/watch
deleted file mode 100644
index 94d0d842f..000000000
--- a/ubuntu/_base/applications/tork/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/tork/tork-(.*)\.tar\.gz