summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-04-11 19:35:35 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-04-11 19:35:35 +0200
commit40cef37547358e1d99429ddd17bd544cf30037d6 (patch)
tree75b4b272804ddf1f9a35ea65acb974908a156458
parent757fac70f04d13fa7c71888e217fd13d8840b723 (diff)
downloadtde-packaging-40cef37547358e1d99429ddd17bd544cf30037d6.tar.gz
tde-packaging-40cef37547358e1d99429ddd17bd544cf30037d6.zip
DEB kuickshow: Switch to cmake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/applications/kuickshow/debian/control2
-rwxr-xr-xdebian/_base/applications/kuickshow/debian/rules42
-rw-r--r--ubuntu/_base/applications/kuickshow/debian/control2
-rwxr-xr-xubuntu/_base/applications/kuickshow/debian/rules42
4 files changed, 28 insertions, 60 deletions
diff --git a/debian/_base/applications/kuickshow/debian/control b/debian/_base/applications/kuickshow/debian/control
index a602f4ca8..acecc334e 100644
--- a/debian/_base/applications/kuickshow/debian/control
+++ b/debian/_base/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, imlib11-dev
Standards-Version: 3.8.4
Package: kuickshow-trinity
diff --git a/debian/_base/applications/kuickshow/debian/rules b/debian/_base/applications/kuickshow/debian/rules
index 73239e354..f4911ce0a 100755
--- a/debian/_base/applications/kuickshow/debian/rules
+++ b/debian/_base/applications/kuickshow/debian/rules
@@ -1,36 +1,20 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
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/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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"
binary-install/kuickshow-trinity::
mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/
diff --git a/ubuntu/_base/applications/kuickshow/debian/control b/ubuntu/_base/applications/kuickshow/debian/control
index 89f9430d0..10ef29658 100644
--- a/ubuntu/_base/applications/kuickshow/debian/control
+++ b/ubuntu/_base/applications/kuickshow/debian/control
@@ -2,7 +2,7 @@ Source: kuickshow-trinity
Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, gawk, tdelibs14-trinity-dev, imlib11-dev, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, tdelibs14-trinity-dev, imlib11-dev
Standards-Version: 3.8.4
Package: kuickshow-trinity
diff --git a/ubuntu/_base/applications/kuickshow/debian/rules b/ubuntu/_base/applications/kuickshow/debian/rules
index 73239e354..f4911ce0a 100755
--- a/ubuntu/_base/applications/kuickshow/debian/rules
+++ b/ubuntu/_base/applications/kuickshow/debian/rules
@@ -1,36 +1,20 @@
-#! /usr/bin/make -f
+#!/usr/bin/make -f
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/tde
-DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
-DEB_CONFIGURE_PREFIX := /opt/trinity
-DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
-
-cdbs_configure_flags := --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
-
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
- && echo xz || echo bzip2)
-
-post-patches:: debian/stamp-bootstrap
-
-debian/stamp-bootstrap:
-ifneq "$(wildcard /usr/share/libtool/ltmain.sh)" ""
- cp -f /usr/share/libtool/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
- cp -f /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
- cp -f /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
- cp -f /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-
- make -f admin/Makefile.common cvs
- touch debian/stamp-bootstrap
+DEB_CMAKE_EXTRA_FLAGS := \
+ -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
+ -DCMAKE_INSTALL_PREFIX="/opt/trinity" \
+ -DCONFIG_INSTALL_DIR="/etc/trinity" \
+ -DSYSCONF_INSTALL_DIR="/etc" \
+ -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"
binary-install/kuickshow-trinity::
mv debian/kuickshow-trinity/usr/share/man debian/kuickshow-trinity/opt/trinity/share/