summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2021-06-24 20:49:59 +0200
committerSlávek Banko <slavek.banko@axis.cz>2021-06-25 02:35:45 +0200
commitabf1c9f3ff5d672fd6572282561bad77d94aa308 (patch)
tree4a4e293b8de2bdc5e2f369f89cee56a6110c4ecb
parentd8d4c84f8c15f608bdd0ef600cbbbb6efc01f797 (diff)
downloadtde-packaging-abf1c9f3ff5d672fd6572282561bad77d94aa308.tar.gz
tde-packaging-abf1c9f3ff5d672fd6572282561bad77d94aa308.zip
DEB kopete-otr: Switch to cmake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 47df847e18c5ee625ec664a238072969b17802bc)
-rw-r--r--debian/_base/applications/kopete-otr/debian/control2
-rwxr-xr-xdebian/_base/applications/kopete-otr/debian/rules37
-rw-r--r--debian/_base/applications/kopete-otr/debian/watch3
-rw-r--r--ubuntu/_base/applications/kopete-otr/debian/control2
-rwxr-xr-xubuntu/_base/applications/kopete-otr/debian/rules37
-rw-r--r--ubuntu/_base/applications/kopete-otr/debian/watch3
6 files changed, 26 insertions, 58 deletions
diff --git a/debian/_base/applications/kopete-otr/debian/control b/debian/_base/applications/kopete-otr/debian/control
index 222ceabdf..1840098de 100644
--- a/debian/_base/applications/kopete-otr/debian/control
+++ b/debian/_base/applications/kopete-otr/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0)
Standards-Version: 3.8.4
Package: kopete-otr-trinity
diff --git a/debian/_base/applications/kopete-otr/debian/rules b/debian/_base/applications/kopete-otr/debian/rules
index 205e98266..a6797f19a 100755
--- a/debian/_base/applications/kopete-otr/debian/rules
+++ b/debian/_base/applications/kopete-otr/debian/rules
@@ -1,30 +1,17 @@
#!/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
-
-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/trinity" \
+ -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"
diff --git a/debian/_base/applications/kopete-otr/debian/watch b/debian/_base/applications/kopete-otr/debian/watch
deleted file mode 100644
index 50ddb75fa..000000000
--- a/debian/_base/applications/kopete-otr/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://kopete-otr.follefuder.org/ \.\/kopete-otr-(.*)\.tar\.bz2
diff --git a/ubuntu/_base/applications/kopete-otr/debian/control b/ubuntu/_base/applications/kopete-otr/debian/control
index eef250100..acc314c08 100644
--- a/ubuntu/_base/applications/kopete-otr/debian/control
+++ b/ubuntu/_base/applications/kopete-otr/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Harald Sitter <apachelogger@ubuntu.com>
-Build-Depends: cdbs, debhelper (>= 9~), tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0), automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdenetwork-trinity-dev, libotr5-dev | libotr2-dev (>= 3.0.0)
Standards-Version: 3.8.4
Package: kopete-otr-trinity
diff --git a/ubuntu/_base/applications/kopete-otr/debian/rules b/ubuntu/_base/applications/kopete-otr/debian/rules
index 205e98266..a6797f19a 100755
--- a/ubuntu/_base/applications/kopete-otr/debian/rules
+++ b/ubuntu/_base/applications/kopete-otr/debian/rules
@@ -1,30 +1,17 @@
#!/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
-
-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/trinity" \
+ -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"
diff --git a/ubuntu/_base/applications/kopete-otr/debian/watch b/ubuntu/_base/applications/kopete-otr/debian/watch
deleted file mode 100644
index 50ddb75fa..000000000
--- a/ubuntu/_base/applications/kopete-otr/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-
-http://kopete-otr.follefuder.org/ \.\/kopete-otr-(.*)\.tar\.bz2