Branch: master

5c8ccdde 2019-05-23 15:04:43 Slávek Banko
DEB keep: 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/keep/debian/control
M debian/_base/applications/keep/debian/docs
M debian/_base/applications/keep/debian/rules
M ubuntu/_base/applications/keep/debian/control
M ubuntu/_base/applications/keep/debian/docs
M ubuntu/_base/applications/keep/debian/rules
R debian/_base/applications/keep/debian/keep.xml
R debian/_base/applications/keep/debian/watch
R ubuntu/_base/applications/keep/debian/keep.xml
R ubuntu/_base/applications/keep/debian/watch

debian/_base/applications/keep/debian/control

diff --git a/debian/_base/applications/keep/debian/control b/debian/_base/applications/keep/debian/control
index 90377ac..5068f67 100644
--- a/debian/_base/applications/keep/debian/control
+++ b/debian/_base/applications/keep/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Timothy Pearson <kb9vqf@...>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@...>
 Uploaders: Fathi Boudra <fboudra@...>, Mark Purcell <msp@...>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: keep-trinity

debian/_base/applications/keep/debian/docs

diff --git a/debian/_base/applications/keep/debian/docs b/debian/_base/applications/keep/debian/docs
index 724e084..ca0272a 100644
--- a/debian/_base/applications/keep/debian/docs
+++ b/debian/_base/applications/keep/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
 README
 TODO

debian/_base/applications/keep/debian/keep.xml

diff --git a/debian/_base/applications/keep/debian/keep.xml b/debian/_base/applications/keep/debian/keep.xml
deleted file mode 100644
index 0e97d35..0000000
--- a/debian/_base/applications/keep/debian/keep.xml
+++ /dev/null
@@ -1,113 +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>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>anthony.mercatante@...</email>
-    </author>
-    <copyright>
-      <year>2005</year>
-      <holder>Anthony Mercatante</holder>
-    </copyright>
-    <!-- XXX IMPORTANT XXX -->
-    <!-- Keep this date up to date: -->
-    <date>2005-12-27</date>
-    <!--  ^^^^^^^^^^ -->
-  </refentryinfo>
-  <refmeta>
-    <refentrytitle>keep</refentrytitle>
-    <manvolnum>1</manvolnum>
-  </refmeta>
-  <refnamediv>
-    <refname>keep</refname>
-    <refpurpose>backup system for TDE</refpurpose>
-  </refnamediv>
-  <refsynopsisdiv>
-    <cmdsynopsis>
-      <command>keep</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>
-      backup system for TDE.
-    </para>
-    <para>
-      The behavior is quite simple: you choose the files you want to backup, you set up the frequency and the number of backup you want to have, and Keep will backup them automatically.
-    </para>
-  </refsect1>
-  <refsect1>
-    <title>OPTIONS</title>
-    <para>
-      All <productname>TDE</productname> and <productname>Qt</productname>
-      programs accept a some common command-line options. keep 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 Anthony Mercatante
-      <email>anthony.mercatante@...</email> for the
-      <productname>Debian</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/keep/debian/rules

diff --git a/debian/_base/applications/keep/debian/rules b/debian/_base/applications/keep/debian/rules
index aef7a1c..cee2a30 100755
--- a/debian/_base/applications/keep/debian/rules
+++ b/debian/_base/applications/keep/debian/rules
@@ -1,46 +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_INSTALL_MANPAGES_keep := keep.1
-
-DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/tde
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
 
-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
-
-build/keep-trinity::
-	/usr/bin/docbook2x-man debian/keep.xml
-
-install/keep-trinity::
-	dh_installman keep.1
-	mv debian/$(cdbs_curpkg)/usr/share/man debian/$(cdbs_curpkg)/opt/trinity/share/
-
-clean::
-	rm -f debian/stamp-bootstrap
-	rm -f keep.1
+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"

debian/_base/applications/keep/debian/watch

diff --git a/debian/_base/applications/keep/debian/watch b/debian/_base/applications/keep/debian/watch
deleted file mode 100644
index db207d2..0000000
--- a/debian/_base/applications/keep/debian/watch
+++ /dev/null
@@ -1,2 +0,0 @@
-version=3
-http://jr.falleri.free.fr/files/devel/keep/keep-(.*)\.tar\.gz

ubuntu/_base/applications/keep/debian/control

diff --git a/ubuntu/_base/applications/keep/debian/control b/ubuntu/_base/applications/keep/debian/control
index 2330b6b..11d27c5 100644
--- a/ubuntu/_base/applications/keep/debian/control
+++ b/ubuntu/_base/applications/keep/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Timothy Pearson <kb9vqf@...>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@...>
 Uploaders: Fathi Boudra <fboudra@...>, Mark Purcell <msp@...>
-Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, tdelibs14-trinity-dev, docbook2x, docbook-xml, automake, autoconf, libtool, libltdl-dev
+Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, cmake, tdelibs14-trinity-dev
 Standards-Version: 3.8.4
 
 Package: keep-trinity

ubuntu/_base/applications/keep/debian/docs

diff --git a/ubuntu/_base/applications/keep/debian/docs b/ubuntu/_base/applications/keep/debian/docs
index 724e084..ca0272a 100644
--- a/ubuntu/_base/applications/keep/debian/docs
+++ b/ubuntu/_base/applications/keep/debian/docs
@@ -1,2 +1,3 @@
+AUTHORS
 README
 TODO

ubuntu/_base/applications/keep/debian/keep.xml

diff --git a/ubuntu/_base/applications/keep/debian/keep.xml b/ubuntu/_base/applications/keep/debian/keep.xml
deleted file mode 100644
index 0e97d35..0000000
--- a/ubuntu/_base/applications/keep/debian/keep.xml
+++ /dev/null
@@ -1,113 +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>Mercatante</firstname>
-      <surname>Anthony</surname>
-      <email>anthony.mercatante@...</email>
-    </author>
-    <copyright>
-      <year>2005</year>
** Diff limit reached (max: 250 lines) **