Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

3 files changed, 17 insertions, 3 deletions

diff --git a/debian/wheezy/tdetoys/debian/control b/debian/wheezy/tdetoys/debian/control
index e583487ae..a603814b4 100644
--- a/debian/wheezy/tdetoys/debian/control
+++ b/debian/wheezy/tdetoys/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, tdelibs4-trinity-dev, gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev
 Standards-Version: 3.8.4
 
 Package: tdetoys-trinity
diff --git a/debian/wheezy/tdetoys/debian/rules b/debian/wheezy/tdetoys/debian/rules
index 60a5a9cf4..da1268d9f 100755
--- a/debian/wheezy/tdetoys/debian/rules
+++ b/debian/wheezy/tdetoys/debian/rules
@@ -1,6 +1,7 @@
 #! /usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-qt-kde.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
@@ -14,7 +15,20 @@ cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xine
 
 DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --includedir="/opt/trinity/include" --mandir="/opt/trinity/share/man" --infodir="/opt/trinity/share/info"
 
+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"
+
 DEB_DH_STRIP_ARGS  := --dbg-package=tdetoys-trinity-dbg
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog
 DEB_INSTALL_CHANGELOGS_kteatime-trinity := kteatime/ChangeLog
diff --git a/debian/wheezy/tdetoys/debian/source/options b/debian/wheezy/tdetoys/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/debian/wheezy/tdetoys/debian/source/options
+++ b/debian/wheezy/tdetoys/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences