Branch: master

27ff58e5 2019-05-28 11:57:46 Slávek Banko
DEB kerry: Switch to cmake.
The man page has been moved to the main tree.

Signed-off-by: Slávek Banko <slavek.banko@...>
M debian/_base/applications/kerry/debian/control
M debian/_base/applications/kerry/debian/rules
M ubuntu/_base/applications/kerry/debian/control
M ubuntu/_base/applications/kerry/debian/rules
R debian/_base/applications/kerry/debian/kerry.1.docbook
R ubuntu/_base/applications/kerry/debian/kerry.1.docbook

debian/_base/applications/kerry/debian/control

diff --git a/debian/_base/applications/kerry/debian/control b/debian/_base/applications/kerry/debian/control
index 21659ff..65dd5a7 100644
--- a/debian/_base/applications/kerry/debian/control
+++ b/debian/_base/applications/kerry/debian/control
@@ -2,7 +2,7 @@
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@...>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0)
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.4
 

debian/_base/applications/kerry/debian/kerry.1.docbook

diff --git a/debian/_base/applications/kerry/debian/kerry.1.docbook b/debian/_base/applications/kerry/debian/kerry.1.docbook
deleted file mode 100644
index c286af6..0000000
--- a/debian/_base/applications/kerry/debian/kerry.1.docbook
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Jonathan Patrick</firstname>
-      <surname>Davies</surname>
-      <email>jpatrick@...</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Jonathan Patrick Davies</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2006-03-26</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>kerry</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>kerry</refname>
-    <refpurpose>a Beagle frontend for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>kautoclick</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      Kerry is a frontend for Beagle for the <productname>TDE</productname> desktop.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options.  Kerry has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
-        <title>Generic options:</title>
-        <varlistentry>
-          <term> <option>--help</option> </term>
-          <listitem> <para>Show help about options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-qt</option> </term>
-          <listitem> <para>Show Qt specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-tde</option> </term>
-          <listitem> <para>Show TDE specific options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--help-all</option> </term>
-          <listitem> <para>Show all options</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--author</option> </term>
-          <listitem> <para>Show author information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>-v</option>, <option>--version</option> </term>
-          <listitem> <para>Show version information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--license</option> </term>
-          <listitem> <para>Show license information</para> </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term> <option>--</option> </term>
-          <listitem> <para>Indicates end of options</para> </listitem>
-        </varlistentry>
-      </variablelist>
-      <!-- TODO * add all the rest of the options, but maybe find an automated
-      way to keep it up to date -->
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>COPYRIGHT</title>
-    <para>
-      This manual page was written by Jonathan Patrick Davies
-      <email>jpatrick@...</email> for the
-      <productname>Ubuntu</productname> system (but may be used by others).
-      Permission is granted to copy, distribute and/or modify this document
-      under the terms of the <acronym>GNU</acronym> General Public License,
-      Version 2 or any later version published by the Free Software Foundation.
-    </para>
-    <para>
-      On Debian systems, the complete text of the GNU General Public
-      License can be found in
-      <filename>/usr/share/common-licenses/GPL</filename>.
-    </para>
-  </refsect1>
-</refentry>

debian/_base/applications/kerry/debian/rules

diff --git a/debian/_base/applications/kerry/debian/rules b/debian/_base/applications/kerry/debian/rules
index a84cc1f..cee2a30 100755
--- a/debian/_base/applications/kerry/debian/rules
+++ b/debian/_base/applications/kerry/debian/rules
@@ -1,33 +1,19 @@
 #!/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
-
-DEB_INSTALL_MANPAGES_kerry-trinity = kerry.1
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-build/kerry-trinity::
-	docbook2x-man debian/kerry.1.docbook
-
-clean::
-	rm -f kerry.1
-
-binary-post-install/kerry-trinity::
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/libtdeinit_kerry.so
-	chrpath -d debian/kerry-trinity/opt/trinity/bin/kerry
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kerry.so
-	chrpath -d debian/kerry-trinity/opt/trinity/lib/trinity/kcm_beagle.so
-	mkdir -p debian/kerry-trinity/opt/trinity/share/man/man1/
-	mv debian/kerry-trinity/usr/share/man/man1/kerry.1 debian/kerry-trinity/opt/trinity/share/man/man1/kerry.1
-	rm -rf debian/kerry-trinity/usr/share/man
+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"

ubuntu/_base/applications/kerry/debian/control

diff --git a/ubuntu/_base/applications/kerry/debian/control b/ubuntu/_base/applications/kerry/debian/control
index 191180c..0ae6c68 100644
--- a/ubuntu/_base/applications/kerry/debian/control
+++ b/ubuntu/_base/applications/kerry/debian/control
@@ -2,7 +2,7 @@
 Section: tde
 Priority: optional
 Maintainer: Timothy Pearson <kb9vqf@...>
-Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0), docbook2x, chrpath, automake, autoconf, libtool, libltdl-dev
+Build-Depends: debhelper (>= 7.0.50~), quilt, cdbs, cmake, tdelibs14-trinity-dev, libkonq4-trinity-dev, libbeagle-dev (>= 0.3.0)
 Homepage: http://en.opensuse.org/Kerry
 Standards-Version: 3.8.4
 

ubuntu/_base/applications/kerry/debian/kerry.1.docbook

diff --git a/ubuntu/_base/applications/kerry/debian/kerry.1.docbook b/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
deleted file mode 100644
index c286af6..0000000
--- a/ubuntu/_base/applications/kerry/debian/kerry.1.docbook
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-]>
-<refentry>
-  <refentryinfo>
-    <author>
-      <firstname>Jonathan Patrick</firstname>
-      <surname>Davies</surname>
-      <email>jpatrick@...</email>
-    </author>
-    <copyright>
-      <year>2006</year>
-      <holder>Jonathan Patrick Davies</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2006-03-26</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>kerry</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>kerry</refname>
-    <refpurpose>a Beagle frontend for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>kautoclick</command>
-      <arg choice="opt">
-        <option><replaceable>Qt-options</replaceable></option>
-      </arg>
-      <arg choice="opt">
-        <option><replaceable>TDE-options</replaceable></option>
-      </arg>
-    </cmdsynopsis>
-  </refsynopsisdiv>
-  <refsect1>
-    <title>DESCRIPTION</title>
-    <para>
-      Kerry is a frontend for Beagle for the <productname>TDE</productname> desktop.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options.  Kerry has no
-      application-specific options.
-    </para>
-    <para>
-      <variablelist>
** Diff limit reached (max: 250 lines) **