summaryrefslogtreecommitdiffstats
path: root/ubuntu/precise/tdeutils
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2013-01-03 22:47:53 +0100
committerFrancois Andriot <francois.andriot@free.fr>2013-01-03 22:47:53 +0100
commitd2f32337f00cf98faef8475e769d9c0381efd257 (patch)
tree9890ceb134945c4f24e624dca8ac4fa03888a979 /ubuntu/precise/tdeutils
parentb566058ccb7fa94c6e34fb1e1349b093d4482d6a (diff)
parentfe7329f1eaa98f63b62e23449bb1345b3395ed37 (diff)
downloadtde-packaging-d2f32337f00cf98faef8475e769d9c0381efd257.tar.gz
tde-packaging-d2f32337f00cf98faef8475e769d9c0381efd257.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'ubuntu/precise/tdeutils')
-rw-r--r--ubuntu/precise/tdeutils/debian/control2
-rwxr-xr-xubuntu/precise/tdeutils/debian/rules23
-rw-r--r--ubuntu/precise/tdeutils/debian/source/options4
3 files changed, 26 insertions, 3 deletions
diff --git a/ubuntu/precise/tdeutils/debian/control b/ubuntu/precise/tdeutils/debian/control
index 8af135969..23132b0e0 100644
--- a/ubuntu/precise/tdeutils/debian/control
+++ b/ubuntu/precise/tdeutils/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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), cmake, autotools-dev, gawk, gettext, tdelibs4-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, sharutils, automake, autoconf, libtool, libltdl-dev
Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs4-trinity-doc
Standards-Version: 3.8.4
diff --git a/ubuntu/precise/tdeutils/debian/rules b/ubuntu/precise/tdeutils/debian/rules
index f0a8e0d00..19848196e 100755
--- a/ubuntu/precise/tdeutils/debian/rules
+++ b/ubuntu/precise/tdeutils/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
@@ -16,10 +17,32 @@ DEB_KDE_APIDOX := yes
DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib
+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_DPMS="ON" \
+ -DWITH_ASUS="ON" \
+ -DWITH_VAIO="ON" \
+ -DWITH_THINKPAD="ON" \
+ -DWITH_I8K="ON" \
+ -DWITH_SNMP="ON" \
+ -DWITH_SENSORS="ON" \
+ -DWITH_XMMS="ON" \
+ -DWITH_KNEWSTUFF="ON"
+
DOC_HTML_PRUNE := kcontrol-trinity kinfocenter-trinity ktimer-trinity kcharselect-trinity ksim-trinity
DEB_DH_STRIP_ARGS := --exclude=examples --dbg-package=tdeutils-trinity-dbg
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+ && echo xz || echo bzip2)
+
PACKAGES_WITH_LIBS := khexedit-trinity klaptopdaemon-trinity kmilo-trinity kregexpeditor-trinity ksim-trinity
#shlibs_ver = 4:3.5.0-1
diff --git a/ubuntu/precise/tdeutils/debian/source/options b/ubuntu/precise/tdeutils/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/tdeutils/debian/source/options
+++ b/ubuntu/precise/tdeutils/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