summaryrefslogtreecommitdiffstats
path: root/ubuntu
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2018-09-01 19:25:24 +0200
committerSlávek Banko <slavek.banko@axis.cz>2018-09-01 19:25:24 +0200
commitaa1d9d983c8a52692cd8929c3f4b3b0c5ef2e568 (patch)
tree08faae4aa1fac616f2e1b23d591b0e20f1758c8b /ubuntu
parent4cfc638f83bd6cb3bf9c1d624b148d00102788e4 (diff)
downloadtde-packaging-aa1d9d983c8a52692cd8929c3f4b3b0c5ef2e568.tar.gz
tde-packaging-aa1d9d983c8a52692cd8929c3f4b3b0c5ef2e568.zip
DEB tdeadmin: Switch to cmake
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'ubuntu')
-rw-r--r--ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk6
-rw-r--r--ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk4
-rw-r--r--ubuntu/maverick/tdeadmin/debian/control2
-rwxr-xr-xubuntu/maverick/tdeadmin/debian/rules15
4 files changed, 23 insertions, 4 deletions
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
index 61f3ab2dc..60ccb9eef 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/debian-qt-kde.mk
@@ -10,6 +10,7 @@ _cdbs_class_debian-qt-kde := 1
# Note: This _must_ be included before autotools.mk, or it won't work.
common-configure-arch common-configure-indep:: debian/stamp-cvs-make
debian/stamp-cvs-make:
+ifndef _cdbs_class_cmake
cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
@@ -18,10 +19,11 @@ ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
endif
$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
+endif
touch debian/stamp-cvs-make
include debian/cdbs/kde.mk$(_cdbs_makefile_suffix)
-include debian/cdbs/uploaders.mk
+#include debian/cdbs/uploaders.mk
ifndef _cdbs_rules_patchsys_quilt
DEB_PATCHDIRS := debian/patches/common debian/patches
@@ -103,6 +105,7 @@ binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
done
clean::
+ifndef _cdbs_class_cmake
if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
cd $(DEB_SRCDIR); \
find . -name Makefile.in -print | \
@@ -111,6 +114,7 @@ clean::
configure configure.files configure.in stamp-h.in \
subdirs; \
fi
+endif
rm -f debian/stamp-cvs-make
endif
diff --git a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
index 765560c89..023886fc8 100644
--- a/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
+++ b/ubuntu/maverick/tdeadmin/debian/cdbs/kde.mk
@@ -35,7 +35,9 @@ else
DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
endif
+ifndef _cdbs_class_cmake
include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
+endif
export kde_cgidir = \$${libdir}/cgi-bin
export kde_confdir = \$${sysconfdir}/trinity
@@ -59,7 +61,7 @@ endif
cdbs_configure_flags += --with-qt-dir=/usr/share/qt3 --disable-rpath --with-xinerama $(cdbs_kde_enable_final) $(cdbs_kde_enable_debug)
DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include/tde"
+DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
diff --git a/ubuntu/maverick/tdeadmin/debian/control b/ubuntu/maverick/tdeadmin/debian/control
index e28ffc3f0..f193b07e1 100644
--- a/ubuntu/maverick/tdeadmin/debian/control
+++ b/ubuntu/maverick/tdeadmin/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>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), autotools-dev, debhelper (>= 7.0.50~), quilt, docbook-to-man, gawk, gettext, tdelibs14-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, automake, autoconf, libtool, libltdl-dev
+Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 7.0.50~), quilt, cmake, docbook-to-man, gawk, gettext, tdelibs14-trinity-dev, libbz2-dev, libpam0g-dev, sharutils, texinfo, rpm, libltdl-dev
Standards-Version: 3.8.4
Package: tdeadmin-trinity
diff --git a/ubuntu/maverick/tdeadmin/debian/rules b/ubuntu/maverick/tdeadmin/debian/rules
index 5b23fd38d..cb9b120fc 100755
--- a/ubuntu/maverick/tdeadmin/debian/rules
+++ b/ubuntu/maverick/tdeadmin/debian/rules
@@ -1,11 +1,12 @@
#! /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/patchsys-quilt.mk
include /usr/share/cdbs/1/rules/utils.mk
-DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include/tde
+DEB_CONFIGURE_INCLUDEDIR := /opt/trinity/include
DEB_CONFIGURE_MANDIR := /opt/trinity/share/man
DEB_CONFIGURE_PREFIX := /opt/trinity
DEB_CONFIGURE_INFODIR := /opt/trinity/share/info
@@ -20,3 +21,15 @@ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
DEB_CONFIGURE_EXTRA_FLAGS := \
--without-rpm --with-pam=tde --with-shadow --with-nis \
--with-private-groups --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" \
+ -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" \
+ -DKU_USERPRIVATEGROUP="true"