summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-07-26 11:53:57 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-07-26 11:54:30 +0200
commitc53dbeb31fc6de7050eeb1e269d9af0adbebe5d0 (patch)
treebe31c86b235e8f9c2093472725a107a491fa8c19
parente6e110d1264c18ea83742e2118cf461b25b22650 (diff)
downloadtde-packaging-c53dbeb31fc6de7050eeb1e269d9af0adbebe5d0.tar.gz
tde-packaging-c53dbeb31fc6de7050eeb1e269d9af0adbebe5d0.zip
DEB tde-style-baghira: Switch to cmake.
The man page has been moved to the main tree. Add intltool to build-deps. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/applications/tde-style-baghira/debian/bab-trinity.136
-rw-r--r--debian/_base/applications/tde-style-baghira/debian/control2
-rwxr-xr-xdebian/_base/applications/tde-style-baghira/debian/rules16
-rw-r--r--debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages1
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.136
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/control2
-rwxr-xr-xubuntu/_base/applications/tde-style-baghira/debian/rules16
-rw-r--r--ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages1
8 files changed, 24 insertions, 86 deletions
diff --git a/debian/_base/applications/tde-style-baghira/debian/bab-trinity.1 b/debian/_base/applications/tde-style-baghira/debian/bab-trinity.1
deleted file mode 100644
index c88691405..000000000
--- a/debian/_base/applications/tde-style-baghira/debian/bab-trinity.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\" Author: Jose Luis Tallon <jltallon@adv-solutions.net>
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with the Debian GNU/Linux system; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-.\" 02111-1307 USA
-.TH bab "1" "October 2004"
-.SH NAME
-bab \- Baghira's config tray applet
-.SH SYNOPSIS
-bab
-.SH DESCRIPTION
-.B bab
-is a simple systray application, which enables you to dinamically
-change some aspects of Baghira's configuration without accesing
-Trinity Control Center
-.PP
-Complete documentation can be found in docbook format in
-/opt/trinity/share/doc/kde/HTML/<lang>/baghira/ on this system.
-.SH AUTHOR
- Thomas L\[:u]bking <baghira-style@users.sourceforge.net>
-.PP
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv\-solutions.net>
-for the \fBDebian\fP system (but may be used by others).
diff --git a/debian/_base/applications/tde-style-baghira/debian/control b/debian/_base/applications/tde-style-baghira/debian/control
index 46f2a54ef..ad7abf025 100644
--- a/debian/_base/applications/tde-style-baghira/debian/control
+++ b/debian/_base/applications/tde-style-baghira/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdebase-trinity-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdebase-trinity-dev, libxtst-dev
Standards-Version: 3.8.0
Package: tde-style-baghira-trinity
diff --git a/debian/_base/applications/tde-style-baghira/debian/rules b/debian/_base/applications/tde-style-baghira/debian/rules
index 2aebaac7b..a37376c4a 100755
--- a/debian/_base/applications/tde-style-baghira/debian/rules
+++ b/debian/_base/applications/tde-style-baghira/debian/rules
@@ -3,10 +3,16 @@
include /usr/share/cdbs/1/rules/debhelper.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
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/tde-style-baghira/debian/tde-style-baghira-trinity.manpages b/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
deleted file mode 100644
index c462e2d47..000000000
--- a/debian/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/bab-trinity.1
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.1 b/ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.1
deleted file mode 100644
index c88691405..000000000
--- a/ubuntu/_base/applications/tde-style-baghira/debian/bab-trinity.1
+++ /dev/null
@@ -1,36 +0,0 @@
-.\" Author: Jose Luis Tallon <jltallon@adv-solutions.net>
-.\"
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public License
-.\" along with the Debian GNU/Linux system; if not, write to the Free
-.\" Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-.\" 02111-1307 USA
-.TH bab "1" "October 2004"
-.SH NAME
-bab \- Baghira's config tray applet
-.SH SYNOPSIS
-bab
-.SH DESCRIPTION
-.B bab
-is a simple systray application, which enables you to dinamically
-change some aspects of Baghira's configuration without accesing
-Trinity Control Center
-.PP
-Complete documentation can be found in docbook format in
-/opt/trinity/share/doc/kde/HTML/<lang>/baghira/ on this system.
-.SH AUTHOR
- Thomas L\[:u]bking <baghira-style@users.sourceforge.net>
-.PP
-This manual page was written by Jose Luis Tallon
-.nh
-<jltallon@adv\-solutions.net>
-for the \fBDebian\fP system (but may be used by others).
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/control b/ubuntu/_base/applications/tde-style-baghira/debian/control
index 46f2a54ef..ad7abf025 100644
--- a/ubuntu/_base/applications/tde-style-baghira/debian/control
+++ b/ubuntu/_base/applications/tde-style-baghira/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
X-Original-Maintainer: Jose Luis Tallon <jltallon@adv-solutions.net>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, automake, libtool, tdebase-trinity-dev, libxtst-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake, intltool, tdebase-trinity-dev, libxtst-dev
Standards-Version: 3.8.0
Package: tde-style-baghira-trinity
diff --git a/ubuntu/_base/applications/tde-style-baghira/debian/rules b/ubuntu/_base/applications/tde-style-baghira/debian/rules
index 2aebaac7b..a37376c4a 100755
--- a/ubuntu/_base/applications/tde-style-baghira/debian/rules
+++ b/ubuntu/_base/applications/tde-style-baghira/debian/rules
@@ -3,10 +3,16 @@
include /usr/share/cdbs/1/rules/debhelper.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
-
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2)
+
+DEB_CMAKE_EXTRA_FLAGS := \
+ -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/tde-style-baghira/debian/tde-style-baghira-trinity.manpages b/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
deleted file mode 100644
index c462e2d47..000000000
--- a/ubuntu/_base/applications/tde-style-baghira/debian/tde-style-baghira-trinity.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/bab-trinity.1