From 68a05487a2737b6cb4bcd6fe60d16db7886f56e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 2 Dec 2012 18:50:07 +0100 Subject: Switch tdetoys to cmake on Debian and Ubuntu --- ubuntu/precise/tdetoys/debian/control | 2 +- ubuntu/precise/tdetoys/debian/rules | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'ubuntu/precise/tdetoys') diff --git a/ubuntu/precise/tdetoys/debian/control b/ubuntu/precise/tdetoys/debian/control index e583487ae..a603814b4 100644 --- a/ubuntu/precise/tdetoys/debian/control +++ b/ubuntu/precise/tdetoys/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius -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/ubuntu/precise/tdetoys/debian/rules b/ubuntu/precise/tdetoys/debian/rules index 60a5a9cf4..b9707dd97 100755 --- a/ubuntu/precise/tdetoys/debian/rules +++ b/ubuntu/precise/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,6 +15,16 @@ 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_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog -- cgit v1.2.1 From e12b7beacb145e0359e66ec5d4cfc0494d3ca908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 11 Dec 2012 03:02:18 +0100 Subject: Use xz (or bzip2) compression for Debian and Ubuntu binary packages --- ubuntu/precise/tdetoys/debian/rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'ubuntu/precise/tdetoys') diff --git a/ubuntu/precise/tdetoys/debian/rules b/ubuntu/precise/tdetoys/debian/rules index b9707dd97..da1268d9f 100755 --- a/ubuntu/precise/tdetoys/debian/rules +++ b/ubuntu/precise/tdetoys/debian/rules @@ -27,5 +27,8 @@ DEB_CMAKE_EXTRA_FLAGS := \ 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 -- cgit v1.2.1 From 72ac3a0a08befd4b584baedf0222076cdc5243c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 13 Dec 2012 00:55:44 +0100 Subject: Use xz compression for Debian and Ubuntu source files --- ubuntu/precise/tdetoys/debian/source/options | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ubuntu/precise/tdetoys') diff --git a/ubuntu/precise/tdetoys/debian/source/options b/ubuntu/precise/tdetoys/debian/source/options index 9d7c8e036..72f1f5450 100644 --- a/ubuntu/precise/tdetoys/debian/source/options +++ b/ubuntu/precise/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 -- cgit v1.2.1