From a5682e2bf4c2aae0460605c5097644ca3dc9d3bc 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: [PATCH] Switch tdetoys to cmake on Debian and Ubuntu (cherry picked from commit 68a05487a2737b6cb4bcd6fe60d16db7886f56e3) --- debian/lenny/kdetoys/debian/control | 2 +- debian/lenny/kdetoys/debian/rules | 11 +++++++++++ debian/squeeze/kdetoys/debian/control | 2 +- debian/squeeze/kdetoys/debian/rules | 11 +++++++++++ ubuntu/maverick/kdetoys/debian/control | 2 +- ubuntu/maverick/kdetoys/debian/rules | 11 +++++++++++ 6 files changed, 36 insertions(+), 3 deletions(-) diff --git a/debian/lenny/kdetoys/debian/control b/debian/lenny/kdetoys/debian/control index c7b1ee6a4..72b4fde14 100644 --- a/debian/lenny/kdetoys/debian/control +++ b/debian/lenny/kdetoys/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, kdelibs4-trinity-dev (>= 4:3.5.10), 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, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdetoys-trinity diff --git a/debian/lenny/kdetoys/debian/rules b/debian/lenny/kdetoys/debian/rules index 29c4bf046..b6fa5a838 100755 --- a/debian/lenny/kdetoys/debian/rules +++ b/debian/lenny/kdetoys/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=kdetoys-trinity-dbg DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog diff --git a/debian/squeeze/kdetoys/debian/control b/debian/squeeze/kdetoys/debian/control index 26c452c7b..9c549ba80 100644 --- a/debian/squeeze/kdetoys/debian/control +++ b/debian/squeeze/kdetoys/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), quilt, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdetoys-trinity diff --git a/debian/squeeze/kdetoys/debian/rules b/debian/squeeze/kdetoys/debian/rules index 4edb05ead..39bfeb832 100755 --- a/debian/squeeze/kdetoys/debian/rules +++ b/debian/squeeze/kdetoys/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=kdetoys-trinity-dbg DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog diff --git a/ubuntu/maverick/kdetoys/debian/control b/ubuntu/maverick/kdetoys/debian/control index b433e8da1..88b9e4cd4 100644 --- a/ubuntu/maverick/kdetoys/debian/control +++ b/ubuntu/maverick/kdetoys/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), quilt, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, kdelibs4-trinity-dev (>= 4:3.5.10), gawk, gettext, sharutils, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: kdetoys-trinity diff --git a/ubuntu/maverick/kdetoys/debian/rules b/ubuntu/maverick/kdetoys/debian/rules index 4edb05ead..39bfeb832 100755 --- a/ubuntu/maverick/kdetoys/debian/rules +++ b/ubuntu/maverick/kdetoys/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=kdetoys-trinity-dbg DEB_INSTALL_CHANGELOGS_kodo-trinity := kodo/ChangeLog