diff options
10 files changed, 26 insertions, 60 deletions
diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/control b/debian/_base/applications/utilities/qalculate-tde/debian/control index 56889bd5c..dc6bfaba3 100644 --- a/debian/_base/applications/utilities/qalculate-tde/debian/control +++ b/debian/_base/applications/utilities/qalculate-tde/debian/control @@ -3,7 +3,7 @@ Section: math Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Vincent Legout <vincent@legout.info> -Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, libqalculate-dev (>= 0.9.6), libcln-dev, libgmp3-dev, libxml2-dev, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6) Standards-Version: 3.8.4 Homepage: http://qalculate.sourceforge.net/ diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 deleted file mode 100644 index 90682e55b..000000000 --- a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 +++ /dev/null @@ -1,16 +0,0 @@ -.TH QALC 1 "28 December 2008" -.SH NAME -qalculate-tde \- Powerful and easy to use desktop calculator -.SH SYNOPSIS -.B qalculate-tde -.SH DESCRIPTION -Qalculate! is a small and simple to use calculator but with much power and -versatility underneath. Features include customizable functions, units, -arbitrary precision using a one-line fault-tolerant expression entry. -.PP -\fBqalculate-tde\fP is the TDE version of Qalculate!. -.SH AUTHORS -Original qalculate-kde was written by Niklas Knutsson <nq@altern.org>. -.PP -This manual page was originally written by Vincent Legout <vincent@legout.info>, -for the Debian system (but may be used by others). diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages b/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages deleted file mode 100644 index f3d6ef522..000000000 --- a/debian/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/qalculate-tde.1 diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/rules b/debian/_base/applications/utilities/qalculate-tde/debian/rules index d03dd383d..a6797f19a 100755 --- a/debian/_base/applications/utilities/qalculate-tde/debian/rules +++ b/debian/_base/applications/utilities/qalculate-tde/debian/rules @@ -1,15 +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 -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -install/qalculate-trinity:: - rm debian/qalculate-trinity/opt/trinity/bin/qalculate - -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" diff --git a/debian/_base/applications/utilities/qalculate-tde/debian/watch b/debian/_base/applications/utilities/qalculate-tde/debian/watch deleted file mode 100644 index c98cd4d96..000000000 --- a/debian/_base/applications/utilities/qalculate-tde/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/qalculate/ qalculate-kde-(.*).tar.gz diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control index 56889bd5c..dc6bfaba3 100644 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/control +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/control @@ -3,7 +3,7 @@ Section: math Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> X-Original-Maintainer: Vincent Legout <vincent@legout.info> -Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, libqalculate-dev (>= 0.9.6), libcln-dev, libgmp3-dev, libxml2-dev, tdelibs-trinity-dev +Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, tdelibs-trinity-dev, libqalculate-dev (>= 0.9.6) Standards-Version: 3.8.4 Homepage: http://qalculate.sourceforge.net/ diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 deleted file mode 100644 index 90682e55b..000000000 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-tde.1 +++ /dev/null @@ -1,16 +0,0 @@ -.TH QALC 1 "28 December 2008" -.SH NAME -qalculate-tde \- Powerful and easy to use desktop calculator -.SH SYNOPSIS -.B qalculate-tde -.SH DESCRIPTION -Qalculate! is a small and simple to use calculator but with much power and -versatility underneath. Features include customizable functions, units, -arbitrary precision using a one-line fault-tolerant expression entry. -.PP -\fBqalculate-tde\fP is the TDE version of Qalculate!. -.SH AUTHORS -Original qalculate-kde was written by Niklas Knutsson <nq@altern.org>. -.PP -This manual page was originally written by Vincent Legout <vincent@legout.info>, -for the Debian system (but may be used by others). diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages b/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages deleted file mode 100644 index f3d6ef522..000000000 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/qalculate-trinity.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/qalculate-tde.1 diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules index d03dd383d..a6797f19a 100755 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules +++ b/ubuntu/_base/applications/utilities/qalculate-tde/debian/rules @@ -1,15 +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 -DEB_CONFIGURE_MANDIR := /opt/trinity/share/man -DEB_CONFIGURE_PREFIX := /opt/trinity -DEB_CONFIGURE_INFODIR := /opt/trinity/share/info - -install/qalculate-trinity:: - rm debian/qalculate-trinity/opt/trinity/bin/qalculate - -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" diff --git a/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch b/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch deleted file mode 100644 index c98cd4d96..000000000 --- a/ubuntu/_base/applications/utilities/qalculate-tde/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://sf.net/qalculate/ qalculate-kde-(.*).tar.gz |