summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-03-20 19:03:44 +0100
committerSlávek Banko <slavek.banko@axis.cz>2022-03-20 19:04:19 +0100
commit73f7eaf7773579993d9eb62ef6cc8d1bf18a85df (patch)
treeb4289f75f44e9d8c1d64e677f287ed7d9c77f5a6
parentc7cc47cc291ffecf2f0b3b16aef3a26204d3d903 (diff)
downloadtde-packaging-73f7eaf7.tar.gz
tde-packaging-73f7eaf7.zip
DEB kmymoney: Switch to cmake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 421d2ac8fac8105608e2f4f475e2497a6ad48433)
-rw-r--r--debian/_base/applications/office/kmymoney/debian/control2
-rw-r--r--debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install2
-rwxr-xr-xdebian/_base/applications/office/kmymoney/debian/rules43
-rw-r--r--debian/_base/applications/office/kmymoney/debian/watch2
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/control2
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install2
-rwxr-xr-xubuntu/_base/applications/office/kmymoney/debian/rules43
-rw-r--r--ubuntu/_base/applications/office/kmymoney/debian/watch2
8 files changed, 30 insertions, 68 deletions
diff --git a/debian/_base/applications/office/kmymoney/debian/control b/debian/_base/applications/office/kmymoney/debian/control
index 8074d6ba6..96d794392 100644
--- a/debian/_base/applications/office/kmymoney/debian/control
+++ b/debian/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
Standards-Version: 3.8.4
Package: kmymoney2-trinity
diff --git a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..9c50137ba 100644
--- a/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/debian/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/tde/kmymoney/*
+opt/trinity/include/kmymoney/*
opt/trinity/lib/lib*.la
opt/trinity/lib/lib*.so
diff --git a/debian/_base/applications/office/kmymoney/debian/rules b/debian/_base/applications/office/kmymoney/debian/rules
index 0f794b445..ba37f1c35 100755
--- a/debian/_base/applications/office/kmymoney/debian/rules
+++ b/debian/_base/applications/office/kmymoney/debian/rules
@@ -1,35 +1,18 @@
#!/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 --disable-pdf-docs
-
-LDFLAGS += -Wl,--as-needed
-
-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
-
-clean::
- rm -f po/*.gmo
+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" \
+ -DBUILD_DEVELOPER_DOCS="OFF"
diff --git a/debian/_base/applications/office/kmymoney/debian/watch b/debian/_base/applications/office/kmymoney/debian/watch
deleted file mode 100644
index b80efc65c..000000000
--- a/debian/_base/applications/office/kmymoney/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/control b/ubuntu/_base/applications/office/kmymoney/debian/control
index 8693580ef..e44a64d57 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/control
+++ b/ubuntu/_base/applications/office/kmymoney/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
Uploaders: Mark Purcell <msp@debian.org>, Fathi Boudra <fabo@debian.org>
-Build-Depends: debhelper (>= 9~), quilt, cdbs, chrpath, automake, libtool, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3, recode, html2ps
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs14-trinity-dev, libofx-dev, libsqlite3-dev, libtqt3-mt-sqlite3
Standards-Version: 3.8.4
Package: kmymoney2-trinity
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
index f8c5dc4e3..9c50137ba 100644
--- a/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
+++ b/ubuntu/_base/applications/office/kmymoney/debian/kmymoney2-trinity-dev.install
@@ -1,3 +1,3 @@
-opt/trinity/include/tde/kmymoney/*
+opt/trinity/include/kmymoney/*
opt/trinity/lib/lib*.la
opt/trinity/lib/lib*.so
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/rules b/ubuntu/_base/applications/office/kmymoney/debian/rules
index 0f794b445..ba37f1c35 100755
--- a/ubuntu/_base/applications/office/kmymoney/debian/rules
+++ b/ubuntu/_base/applications/office/kmymoney/debian/rules
@@ -1,35 +1,18 @@
#!/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 --disable-pdf-docs
-
-LDFLAGS += -Wl,--as-needed
-
-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
-
-clean::
- rm -f po/*.gmo
+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" \
+ -DBUILD_DEVELOPER_DOCS="OFF"
diff --git a/ubuntu/_base/applications/office/kmymoney/debian/watch b/ubuntu/_base/applications/office/kmymoney/debian/watch
deleted file mode 100644
index b80efc65c..000000000
--- a/ubuntu/_base/applications/office/kmymoney/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://sf.net/kmymoney2/kmymoney2-([\d].[\d].[\d])\.tar\.bz2 debian svn-upgrade