DEB tqca: Merge libtqca and tqca-tls into one source package.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 038dfab6dbeaaffbe8460d75d741692579cca213)

44 files changed, 68 insertions, 1262 deletions

diff --git a/debian/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk b/debian/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can 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 program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/_base/dependencies/tqca-tls/debian/cdbs/versions.pl b/debian/_base/dependencies/tqca-tls/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/debian/_base/dependencies/tqca-tls/debian/changelog b/debian/_base/dependencies/tqca-tls/debian/changelog
deleted file mode 100644
index 080b12959..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/changelog
+++ /dev/null
@@ -1,84 +0,0 @@
-tqca-tls (1.0-0) squeeze; urgency=low
-
-  * TQt upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 17 Dec 2011 19:48:00 -0600
-
-qca-tls (1.0-5) natty; urgency=low
-
-  * Natty upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 15 Aug 2011 13:51:00 -0600
-
-qca-tls (1.0-4) unstable; urgency=low
-
-  * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437850)
-  * Fixed a intian warning
-
- -- Jan Niehusmann <jan@debian.org>  Tue, 14 Aug 2007 17:13:06 +0200
-
-qca-tls (1.0-3) unstable; urgency=low
-
-  * Changed two type conversions to const to make gcc happy
-    (Closes: Bug#337449)
-  * Set Standards-Version to 3.6.2.0
-
- -- Jan Niehusmann <jan@debian.org>  Thu, 15 Dec 2005 22:59:09 +0100
-
-qca-tls (1.0-2) unstable; urgency=low
-
-  * Recompiled for C++ ABI transition.
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 26 Aug 2005 18:10:30 +0000
-
-qca-tls (1.0-1) unstable; urgency=low
-
-  * Most of the following changes were done by Peter Palfrader
-    <weasel@debian.org> - many thanks to him!
-  * New upstream version (closes: #235093).
-  * qca-tls is a non-native package now (closes: #235084).
-  * Clean up properly in clean target:
-    rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri
-    (closes: #235089).
-  * Do not copy over config.{sub,guess} from /usr/share during
-    build.  They are not needed at all (closes: #235085).
-  * Remove debian/qca.doc-base.EX example file (closes: #235092).
-  * Do not ship readme in the binary package:  it's just install
-    instructions (closes: #234939).
-  * Something changed that makes the configure script make the
-    Makefile install the .so into usr/lib, as opposed to usr/share
-    (closes: #233530).  At any rate, we will not claim to have
-    built a working package if it happens again:
-  * Make the build fail if we don't have a
-    usr/lib/qt3/plugins/crypto/libqca-tls.so file after install.
-  * Make stamps in debian/rules actually work.
-  * Update copyright file to list current download link
-  * Added QMAKE_PROJECT_DEPTH=0 to .pro file to make qca-tls build in
-    nested directory structures.
-
- -- Jan Niehusmann <jan@debian.org>  Sat, 28 Feb 2004 13:35:28 +0100
-
-qca-tls (0.0-CVS-20031209-1.3) unstable; urgency=low
-
-  * Damn. Added build-depends on libssl-dev...
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 15:06:45 +0100
-
-qca-tls (0.0-CVS-20031209-1.2) unstable; urgency=low
-
-  * Added build-depends on libqt3-mt-dev
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 13:27:34 +0100
-
-qca-tls (0.0-CVS-20031209-1.1) unstable; urgency=low
-
-  * Upload to unstable
-
- -- Jan Niehusmann <jan@debian.org>  Thu, 12 Feb 2004 20:28:19 +0100
-
-qca-tls (0.0-CVS-20031209-1) experimental; urgency=low
-
-  * Initial Release.
-  * New upstream version
-
- -- Jan Niehusmann <jan@debian.org>  Wed, 10 Dec 2003 12:21:07 +0100
diff --git a/debian/_base/dependencies/tqca-tls/debian/compat b/debian/_base/dependencies/tqca-tls/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/debian/_base/dependencies/tqca-tls/debian/control b/debian/_base/dependencies/tqca-tls/debian/control
deleted file mode 100644
index 36ceeaea1..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: tqca-tls
-Section: libs
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqca-dev, libssl-dev
-Standards-Version: 3.8.4
-
-Package: tqca-tls
-Section: libs
-Architecture: any
-Replaces: tqca-tls (<< 4:14.0.0~)
-Breaks: tqca-tls (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
- This is a plugin to provide SSL/TLS capability to programs that
- utilize the TQt Cryptographic Architecture (TQCA).
- .
- TQCA is a library providing an easy API for several cryptographic algorithms 
- to TQt programs.
- .
- At the moment only the tqca-tls plugin is packaged for debian, as it's
- used by the package 'psi'. The generic library and several other plugins
- will be packaged when upstream releases them.
diff --git a/debian/_base/dependencies/tqca-tls/debian/copyright b/debian/_base/dependencies/tqca-tls/debian/copyright
deleted file mode 100644
index e64397c08..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-This package was debianized by Jan Niehusmann <jan@debian.org> on
-Tue,  9 Dec 2003 19:30:45 +0100.
-
-It was downloaded from http://psi.affinix.com/?page=download
-
-
-Upstream Author: Justin Karneges <justin-psi@affinix.com>
-
-Copyright: 
-
-Copyright (C) 2003  Justin Karneges
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in /usr/share/common-licenses/LGPL file.
-
diff --git a/debian/_base/dependencies/tqca-tls/debian/patches/series b/debian/_base/dependencies/tqca-tls/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/patches/series
+++ /dev/null
diff --git a/debian/_base/dependencies/tqca-tls/debian/rules b/debian/_base/dependencies/tqca-tls/debian/rules
deleted file mode 100755
index d3e967902..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/rules
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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_CMAKE_EXTRA_FLAGS := \
- -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -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" \
- -DWITH_ALL_OPTIONS="ON"
diff --git a/debian/_base/dependencies/tqca-tls/debian/source/format b/debian/_base/dependencies/tqca-tls/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/_base/dependencies/tqca-tls/debian/source/options b/debian/_base/dependencies/tqca-tls/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/debian/_base/dependencies/tqca-tls/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/debian/_base/dependencies/tqca/debian/control b/debian/_base/dependencies/tqca/debian/control
index 854f98e7a..f3f6d4d7b 100644
--- a/debian/_base/dependencies/tqca/debian/control
+++ b/debian/_base/dependencies/tqca/debian/control
@@ -1,8 +1,8 @@
-Source: libtqca
+Source: tqca
 Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: libtqca
@@ -23,3 +23,21 @@ Description:
  .
  This is the development package containing header files and link
  libraries for libtqca.
+
+Package: tqca-tls
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Replaces: tqca-tls (<< 4:14.0.0~)
+Breaks: tqca-tls (<< 4:14.0.0~)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
+ This is a plugin to provide SSL/TLS capability to programs that
+ utilize the TQt Cryptographic Architecture (TQCA).
+ .
+ TQCA is a library providing an easy API for several cryptographic algorithms
+ to TQt programs.
+ .
+ At the moment only the tqca-tls plugin is packaged for debian, as it's
+ used by the package 'psi'. The generic library and several other plugins
+ will be packaged when upstream releases them.
diff --git a/debian/_base/dependencies/tqca-tls/debian/docs b/debian/_base/dependencies/tqca/debian/libtqca.docs
index e845566c0..e845566c0 100644
--- a/debian/_base/dependencies/tqca-tls/debian/docs
+++ b/debian/_base/dependencies/tqca/debian/libtqca.docs
diff --git a/dilos/dependencies/tqca-tls/debian/docs b/debian/_base/dependencies/tqca/debian/tqca-tls.docs
index e845566c0..e845566c0 100644
--- a/dilos/dependencies/tqca-tls/debian/docs
+++ b/debian/_base/dependencies/tqca/debian/tqca-tls.docs
diff --git a/debian/_base/dependencies/tqca/debian/tqca-tls.install b/debian/_base/dependencies/tqca/debian/tqca-tls.install
new file mode 100644
index 000000000..893c5dd19
--- /dev/null
+++ b/debian/_base/dependencies/tqca/debian/tqca-tls.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/tqt3/plugins
diff --git a/dilos/dependencies/tqca-tls/debian/cdbs/debian-tde.mk b/dilos/dependencies/tqca-tls/debian/cdbs/debian-tde.mk
deleted file mode 100644
index e2b1dc666..000000000
--- a/dilos/dependencies/tqca-tls/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can 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 program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib/$(DEB_HOST_MULTIARCH))
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
-		/usr/bin/meinproc $(DEB_DESTDIR)/usr/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/usr/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/dilos/dependencies/tqca-tls/debian/cdbs/versions.pl b/dilos/dependencies/tqca-tls/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/dilos/dependencies/tqca-tls/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/dilos/dependencies/tqca-tls/debian/changelog b/dilos/dependencies/tqca-tls/debian/changelog
deleted file mode 100644
index 080b12959..000000000
--- a/dilos/dependencies/tqca-tls/debian/changelog
+++ /dev/null
@@ -1,84 +0,0 @@
-tqca-tls (1.0-0) squeeze; urgency=low
-
-  * TQt upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 17 Dec 2011 19:48:00 -0600
-
-qca-tls (1.0-5) natty; urgency=low
-
-  * Natty upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 15 Aug 2011 13:51:00 -0600
-
-qca-tls (1.0-4) unstable; urgency=low
-
-  * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437850)
-  * Fixed a intian warning
-
- -- Jan Niehusmann <jan@debian.org>  Tue, 14 Aug 2007 17:13:06 +0200
-
-qca-tls (1.0-3) unstable; urgency=low
-
-  * Changed two type conversions to const to make gcc happy
-    (Closes: Bug#337449)
-  * Set Standards-Version to 3.6.2.0
-
- -- Jan Niehusmann <jan@debian.org>  Thu, 15 Dec 2005 22:59:09 +0100
-
-qca-tls (1.0-2) unstable; urgency=low
-
-  * Recompiled for C++ ABI transition.
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 26 Aug 2005 18:10:30 +0000
-
-qca-tls (1.0-1) unstable; urgency=low
-
-  * Most of the following changes were done by Peter Palfrader
-    <weasel@debian.org> - many thanks to him!
-  * New upstream version (closes: #235093).
-  * qca-tls is a non-native package now (closes: #235084).
-  * Clean up properly in clean target:
-    rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri
-    (closes: #235089).
-  * Do not copy over config.{sub,guess} from /usr/share during
-    build.  They are not needed at all (closes: #235085).
-  * Remove debian/qca.doc-base.EX example file (closes: #235092).
-  * Do not ship readme in the binary package:  it's just install
-    instructions (closes: #234939).
-  * Something changed that makes the configure script make the
-    Makefile install the .so into usr/lib, as opposed to usr/share
-    (closes: #233530).  At any rate, we will not claim to have
-    built a working package if it happens again:
-  * Make the build fail if we don't have a
-    usr/lib/qt3/plugins/crypto/libqca-tls.so file after install.
-  * Make stamps in debian/rules actually work.
-  * Update copyright file to list current download link
-  * Added QMAKE_PROJECT_DEPTH=0 to .pro file to make qca-tls build in
-    nested directory structures.
-
- -- Jan Niehusmann <jan@debian.org>  Sat, 28 Feb 2004 13:35:28 +0100
-
-qca-tls (0.0-CVS-20031209-1.3) unstable; urgency=low
-
-  * Damn. Added build-depends on libssl-dev...
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 15:06:45 +0100
-
-qca-tls (0.0-CVS-20031209-1.2) unstable; urgency=low
-
-  * Added build-depends on libqt3-mt-dev
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 13:27:34 +0100
-
-qca-tls (0.0-CVS-20031209-1.1) unstable; urgency=low
-
-  * Upload to unstable
-
- -- Jan Niehusmann <jan@debian.org>  Thu, 12 Feb 2004 20:28:19 +0100
-
-qca-tls (0.0-CVS-20031209-1) experimental; urgency=low
-
-  * Initial Release.
-  * New upstream version
-
- -- Jan Niehusmann <jan@debian.org>  Wed, 10 Dec 2003 12:21:07 +0100
diff --git a/dilos/dependencies/tqca-tls/debian/compat b/dilos/dependencies/tqca-tls/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/dilos/dependencies/tqca-tls/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/dilos/dependencies/tqca-tls/debian/control b/dilos/dependencies/tqca-tls/debian/control
deleted file mode 100644
index 9050373bd..000000000
--- a/dilos/dependencies/tqca-tls/debian/control
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: tqca-tls
-Section: libs
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqca-dev, libssl-dev
-Standards-Version: 3.8.4
-
-Package: tqca-tls
-Section: libs
-Architecture: any
-Multi-Arch: same
-Replaces: tqca-tls (<< 4:14.0.0~)
-Breaks: tqca-tls (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
- This is a plugin to provide SSL/TLS capability to programs that
- utilize the TQt Cryptographic Architecture (TQCA).
- .
- TQCA is a library providing an easy API for several cryptographic algorithms 
- to TQt programs.
- .
- At the moment only the tqca-tls plugin is packaged for debian, as it's
- used by the package 'psi'. The generic library and several other plugins
- will be packaged when upstream releases them.
diff --git a/dilos/dependencies/tqca-tls/debian/copyright b/dilos/dependencies/tqca-tls/debian/copyright
deleted file mode 100644
index e64397c08..000000000
--- a/dilos/dependencies/tqca-tls/debian/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-This package was debianized by Jan Niehusmann <jan@debian.org> on
-Tue,  9 Dec 2003 19:30:45 +0100.
-
-It was downloaded from http://psi.affinix.com/?page=download
-
-
-Upstream Author: Justin Karneges <justin-psi@affinix.com>
-
-Copyright: 
-
-Copyright (C) 2003  Justin Karneges
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in /usr/share/common-licenses/LGPL file.
-
diff --git a/dilos/dependencies/tqca-tls/debian/patches/series b/dilos/dependencies/tqca-tls/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/dilos/dependencies/tqca-tls/debian/patches/series
+++ /dev/null
diff --git a/dilos/dependencies/tqca-tls/debian/rules b/dilos/dependencies/tqca-tls/debian/rules
deleted file mode 100755
index fe21ca438..000000000
--- a/dilos/dependencies/tqca-tls/debian/rules
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/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
-
-ifdef DEB_HOST_MULTIARCH
-  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
-else
-  CMAKE_INSTALL_LIBDIR = lib
-endif
-
-DEB_CMAKE_EXTRA_FLAGS := \
- -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -DCONFIG_INSTALL_DIR="/etc/trinity" \
- -DSYSCONF_INSTALL_DIR="/etc/trinity" \
- -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" \
- -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo \
- -DCMAKE_VERBOSE_MAKEFILE="ON" \
- -DCMAKE_SKIP_RPATH="OFF" \
- -DWITH_ALL_OPTIONS="ON"
diff --git a/dilos/dependencies/tqca-tls/debian/source/format b/dilos/dependencies/tqca-tls/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/dilos/dependencies/tqca-tls/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/dilos/dependencies/tqca-tls/debian/source/options b/dilos/dependencies/tqca-tls/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/dilos/dependencies/tqca-tls/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/dilos/dependencies/tqca/debian/control b/dilos/dependencies/tqca/debian/control
index 854f98e7a..7da73e73c 100644
--- a/dilos/dependencies/tqca/debian/control
+++ b/dilos/dependencies/tqca/debian/control
@@ -1,8 +1,8 @@
-Source: libtqca
+Source: tqca
 Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: libtqca
@@ -23,3 +23,21 @@ Description:
  .
  This is the development package containing header files and link
  libraries for libtqca.
+
+Package: tqca-tls
+Section: libs
+Architecture: any
+Multi-Arch: same
+Replaces: tqca-tls (<< 4:14.0.0~)
+Breaks: tqca-tls (<< 4:14.0.0~)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
+ This is a plugin to provide SSL/TLS capability to programs that
+ utilize the TQt Cryptographic Architecture (TQCA).
+ .
+ TQCA is a library providing an easy API for several cryptographic algorithms
+ to TQt programs.
+ .
+ At the moment only the tqca-tls plugin is packaged for debian, as it's
+ used by the package 'psi'. The generic library and several other plugins
+ will be packaged when upstream releases them.
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/docs b/dilos/dependencies/tqca/debian/libtqca.docs
index e845566c0..e845566c0 100644
--- a/ubuntu/_base/dependencies/tqca-tls/debian/docs
+++ b/dilos/dependencies/tqca/debian/libtqca.docs
diff --git a/dilos/dependencies/tqca/debian/rules b/dilos/dependencies/tqca/debian/rules
index 21df58b4f..bcf875516 100755
--- a/dilos/dependencies/tqca/debian/rules
+++ b/dilos/dependencies/tqca/debian/rules
@@ -16,4 +16,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
  -DWITH_ALL_OPTIONS="ON"
diff --git a/dilos/dependencies/tqca/debian/tqca-tls.docs b/dilos/dependencies/tqca/debian/tqca-tls.docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/dilos/dependencies/tqca/debian/tqca-tls.docs
@@ -0,0 +1 @@
+README
diff --git a/dilos/dependencies/tqca/debian/tqca-tls.install b/dilos/dependencies/tqca/debian/tqca-tls.install
new file mode 100644
index 000000000..02d23f437
--- /dev/null
+++ b/dilos/dependencies/tqca/debian/tqca-tls.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/tqt3/plugins
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk b/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk
deleted file mode 100644
index f36e3527c..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,246 +0,0 @@
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003 Christopher L Cheney <ccheney@debian.org>
-# Copyright © 2019 TDE Team
-# Description: A class for TDE packages; sets TDE environment variables, etc
-#
-# This program is free software; you can 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 program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-ifndef _cdbs_bootstrap
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-endif
-
-ifndef _cdbs_class_debian-qt-kde
-_cdbs_class_debian-qt-kde := 1
-
-# for dh_icons
-CDBS_BUILD_DEPENDS   := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.7ubuntu4)
-
-# Note: This _must_ be included before autotools.mk, or it won't work.
-common-configure-arch common-configure-indep:: debian/stamp-cvs-make
-debian/stamp-cvs-make:
-ifndef _cdbs_class_cmake
-	cp -Rp /usr/share/aclocal/libtool.m4 admin/libtool.m4.in
-ifneq "$(wildcard /usr/share/libtool/config/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/config/ltmain.sh admin/ltmain.sh
-endif
-ifneq "$(wildcard /usr/share/libtool/build-aux/ltmain.sh)" ""
-	cp -Rp /usr/share/libtool/build-aux/ltmain.sh admin/ltmain.sh
-endif
-	$(MAKE) -C $(DEB_SRCDIR) -f admin/Makefile.common dist;
-endif
-	touch debian/stamp-cvs-make
-
-include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
-
-ifdef _cdbs_tarball_dir
-DEB_BUILDDIR = $(_cdbs_tarball_dir)/obj-$(DEB_BUILD_GNU_TYPE)
-else
-DEB_BUILDDIR = obj-$(DEB_BUILD_GNU_TYPE)
-endif
-
-ifndef _cdbs_class_cmake
-include $(_cdbs_class_path)/autotools.mk$(_cdbs_makefile_suffix)
-endif
-
-ifdef _cdbs_class_cmake
-ifneq "$(wildcard /usr/bin/ninja)" ""
-MAKE = ninja -v
-DEB_MAKE_ENVVARS += DESTDIR=$(DEB_DESTDIR)
-DEB_MAKE_INSTALL_TARGET = install
-DEB_CMAKE_NORMAL_ARGS += -GNinja
-endif
-endif
-
-ifndef _cdbs_rules_patchsys_quilt
-DEB_PATCHDIRS := debian/patches/common debian/patches
-endif
-
-export kde_cgidir  = \$${libdir}/cgi-bin
-export kde_confdir = \$${sysconfdir}/trinity
-export kde_htmldir = \$${datadir}/doc/tde/HTML
-
-DEB_KDE_ENABLE_FINAL := yes
-DEB_INSTALL_DOCS_ALL :=
-
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
-DEB_SHLIBDEPS_INCLUDE = $(foreach p,$(PACKAGES_WITH_LIBS),debian/$(p)/usr/lib)
-
-DEB_AC_AUX_DIR = $(DEB_SRCDIR)/admin
-DEB_CONFIGURE_INCLUDEDIR = "\$${prefix}/include"
-DEB_COMPRESS_EXCLUDE = .dcl .docbook -license .tag .sty .el
-
-# The default gzip compressor has been changed in dpkg >= 1.17.0.
-deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \
-                         sed -e "s|.*version ||" -e "s| .*||" | \
-                         xargs -r dpkg --compare-versions 1.17.0 lt \
-                         && echo xz || echo gzip)
-ifeq ($(deb_default_compress),gzip)
-DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
-                               && echo xz || echo bzip2)
-endif
-
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-    cdbs_treat_me_gently_arches := arm m68k alpha ppc64 armel armeb
-    ifeq (,$(filter $(DEB_HOST_ARCH_CPU),$(cdbs_treat_me_gently_arches)))
-        cdbs_kde_enable_final = $(if $(DEB_KDE_ENABLE_FINAL),--enable-final,)
-    else
-        cdbs_kde_enable_final =
-    endif
-endif
-
-ifneq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_final =
-	cdbs_kde_enable_debug = --enable-debug=yes
-else
-	cdbs_kde_enable_debug = --disable-debug
-endif
-
-ifneq (,$(filter debug,$(DEB_BUILD_OPTIONS)))
-	cdbs_kde_enable_debug = --enable-debug=full
-endif
-
-DEB_BUILD_PARALLEL ?= true
-
-cdbs_configure_flags += \
-    --with-qt-dir=/usr/share/qt3 \
-    --disable-rpath \
-    --with-xinerama \
-    $(cdbs_kde_enable_final) \
-    $(cdbs_kde_enable_debug)
-
-
-# This is a convenience target for calling manually.
-# It's not part of the build process.
-buildprep: clean apply-patches
-ifndef _cdbs_class_cmake
-	$(MAKE) -f admin/Makefile.common dist
-endif
-	debian/rules clean
-
-.tdepkginfo:
-	echo "# TDE package information" >.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Source: |Name: |p" >>.tdepkginfo
-	dpkg-parsechangelog | sed -n "s|^Version: |Version: |p" >>.tdepkginfo
-	date +"DateTime: %m/%d/%Y %H:%M" -u -d "$$(dpkg-parsechangelog | sed -n 's|^Date: ||p')" >>.tdepkginfo
-
-post-patches:: .tdepkginfo
-
-common-build-arch:: debian/stamp-man-pages
-debian/stamp-man-pages:
-	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
-	for f in $$(find debian/man -name '*.sgml'); do \
-		docbook-to-man $$f > debian/man/out/`basename $$f .sgml`.1; \
-	done
-	for f in $$(find debian/man -name '*.man'); do \
-		soelim -I debian/man $$f \
-		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
-	done
-	touch debian/stamp-man-pages
-
-common-binary-indep::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_INDEP_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-
-common-binary-arch::
-	( set -e; \
-	tmpf=`mktemp debian/versions.XXXXXX`; \
-	perl debian/cdbs/versions.pl >$$tmpf; \
-	for p in $(DEB_ARCH_PACKAGES); do \
-	    cat $$tmpf >>debian/$$p.substvars; \
-	done; \
-	rm -f $$tmpf )
-	# update multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ -d $$a ] || [ -f $$a.arch ] || \
-	    ! grep -q "\$$(DEB_HOST_MULTIARCH)" $$a || \
-	    sed -i.arch "s|\$$(DEB_HOST_MULTIARCH)|$(DEB_HOST_MULTIARCH)|g" $$a; \
-	done
-
-clean::
-	rm -rf debian/man/out
-	-rmdir debian/man
-	rm -f debian/stamp-man-pages
-	rm -rf debian/shlibs-check
-	# revert multi-arch path in install files
-	ls -d debian/* | \
-	grep -E "(install|links)$$" | \
-	while read a; do \
-	    [ ! -f $$a.arch ] || \
-	    mv $$a.arch $$a; \
-	done
-
-$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
-	if test -x /usr/bin/dh_icons; then dh_icons -p$(cdbs_curpkg) $(DEB_DH_ICONCACHE_ARGS); fi
-	if test -x /usr/bin/dh_desktop; then dh_desktop -p$(cdbs_curpkg) $(DEB_DH_DESKTOP_ARGS); fi
-	if test -e debian/$(cdbs_curpkg).lintian; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).lintian \
-			debian/$(cdbs_curpkg)/usr/share/lintian/overrides/$(cdbs_curpkg); \
-	fi
-	if test -e debian/$(cdbs_curpkg).presubj; then \
-		install -p -D -m644 debian/$(cdbs_curpkg).presubj \
-			debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)/presubj; \
-	fi
-
-binary-install/$(DEB_SOURCE_PACKAGE)-doc-html::
-	set -e; \
-	for doc in `cd $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en; find . -name index.docbook`; do \
-		pkg=$${doc%/index.docbook}; pkg=$${pkg#./}; \
-		echo Building $$pkg HTML docs...; \
-		mkdir -p $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		cd $(CURDIR)/debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-		/opt/trinity/bin/meinproc $(DEB_DESTDIR)/opt/trinity/share/doc/tde/HTML/en/$$pkg/index.docbook; \
-	done
-	for pkg in $(DOC_HTML_PRUNE) ; do \
-	  rm -rf debian/$(DEB_SOURCE_PACKAGE)-doc-html/opt/trinity/share/doc/tde/HTML/en/$$pkg; \
-	done
-
-common-build-indep:: debian/stamp-kde-apidox
-debian/stamp-kde-apidox:
-	$(if $(DEB_KDE_APIDOX),+$(DEB_MAKE_INVOKE) apidox)
-	touch $@
-
-common-install-indep:: common-install-kde-apidox
-common-install-kde-apidox::
-	$(if $(DEB_KDE_APIDOX),+DESTDIR=$(DEB_DESTDIR) $(DEB_MAKE_INVOKE) install-apidox)
-
-cleanbuilddir::
-	-$(if $(call cdbs_streq,$(DEB_BUILDDIR),$(DEB_SRCDIR)),,rm -rf $(DEB_BUILDDIR))
-
-clean::
-ifndef _cdbs_class_cmake
-	if test -n "$(DEB_KDE_CVS_MAKE)" && test -d $(DEB_SRCDIR); then \
-		cd $(DEB_SRCDIR); \
-		find . -name Makefile.in -print | \
-			xargs --no-run-if-empty rm -f; \
-		rm -f Makefile.am acinclude.m4 aclocal.m4 config.h.in \
-			configure configure.files configure.in stamp-h.in \
-			subdirs; \
-	fi
-endif
-	rm -f .tdepkginfo
-	rm -f debian/stamp-kde-apidox
-	rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/versions.pl b/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/cdbs/versions.pl
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env perl
-
-use strict;
-use warnings;
-
-my $version = `dpkg-parsechangelog | awk '/^Version/ {print \$2}'`;
-my ($version3, $version3_next);
-my ($version2, $version2_next);
-
-($version3 = $version)  =~ s/^(([^.]+\.){2}[^.+~-]+)[.+~-]?[^-]*-[^-]+$/$1/;
-($version2 = $version3) =~ s/\.[^.]+$//;
-
-($version3_next = $version3) =~ s/(?<=\.)(\d+)[a-z]?$/($1+1)/e;
-($version2_next = $version2) =~ s/(?<=\.)(\d+)$/($1+1)/e;
-
-print "TDE-Version3=$version3\n";
-print "TDE-Version2=$version2\n";
-print "TDE-Next-Version3=$version3_next\n";
-print "TDE-Next-Version2=$version2_next\n";
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/changelog b/ubuntu/_base/dependencies/tqca-tls/debian/changelog
deleted file mode 100644
index 7f1c440b0..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/changelog
+++ /dev/null
@@ -1,84 +0,0 @@
-tqca-tls (1.0-0) maverick; urgency=low
-
-  * TQt upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sat, 17 Dec 2011 19:48:00 -0600
-
-qca-tls (1.0-5) natty; urgency=low
-
-  * Natty upload
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 15 Aug 2011 13:51:00 -0600
-
-qca-tls (1.0-4) unstable; urgency=low
-
-  * Honour DEB_BUILD_OPTIONS=nostrip (Closes: Bug#437850)
-  * Fixed a intian warning
-
- -- Jan Niehusmann <jan@debian.org>  Tue, 14 Aug 2007 17:13:06 +0200
-
-qca-tls (1.0-3) unstable; urgency=low
-
-  * Changed two type conversions to const to make gcc happy
-    (Closes: Bug#337449)
-  * Set Standards-Version to 3.6.2.0
-
- -- Jan Niehusmann <jan@debian.org>  Thu, 15 Dec 2005 22:59:09 +0100
-
-qca-tls (1.0-2) unstable; urgency=low
-
-  * Recompiled for C++ ABI transition.
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 26 Aug 2005 18:10:30 +0000
-
-qca-tls (1.0-1) unstable; urgency=low
-
-  * Most of the following changes were done by Peter Palfrader
-    <weasel@debian.org> - many thanks to him!
-  * New upstream version (closes: #235093).
-  * qca-tls is a non-native package now (closes: #235084).
-  * Clean up properly in clean target:
-    rm -rf .ui .moc .obj Makefile conf.log conf.pri extra.pri
-    (closes: #235089).
-  * Do not copy over config.{sub,guess} from /usr/share during
-    build.  They are not needed at all (closes: #235085).
-  * Remove debian/qca.doc-base.EX example file (closes: #235092).
-  * Do not ship readme in the binary package:  it's just install
-    instructions (closes: #234939).
-  * Something changed that makes the configure script make the
-    Makefile install the .so into usr/lib, as opposed to usr/share
-    (closes: #233530).  At any rate, we will not claim to have
-    built a working package if it happens again:
-  * Make the build fail if we don't have a
-    usr/lib/qt3/plugins/crypto/libqca-tls.so file after install.
-  * Make stamps in debian/rules actually work.
-  * Update copyright file to list current download link
-  * Added QMAKE_PROJECT_DEPTH=0 to .pro file to make qca-tls build in
-    nested directory structures.
-
- -- Jan Niehusmann <jan@debian.org>  Sat, 28 Feb 2004 13:35:28 +0100
-
-qca-tls (0.0-CVS-20031209-1.3) unstable; urgency=low
-
-  * Damn. Added build-depends on libssl-dev...
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 15:06:45 +0100
-
-qca-tls (0.0-CVS-20031209-1.2) unstable; urgency=low
-
-  * Added build-depends on libqt3-mt-dev
-
- -- Jan Niehusmann <jan@debian.org>  Fri, 13 Feb 2004 13:27:34 +0100
-
-qca-tls (0.0-CVS-20031209-1.1) unstable; urgency=low
-
-  * Upload to unstable
-
- -- Jan Niehusmann <jan@debian.org>  Thu, 12 Feb 2004 20:28:19 +0100
-
-qca-tls (0.0-CVS-20031209-1) experimental; urgency=low
-
-  * Initial Release.
-  * New upstream version
-
- -- Jan Niehusmann <jan@debian.org>  Wed, 10 Dec 2003 12:21:07 +0100
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/compat b/ubuntu/_base/dependencies/tqca-tls/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/control b/ubuntu/_base/dependencies/tqca-tls/debian/control
deleted file mode 100644
index 36ceeaea1..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/control
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: tqca-tls
-Section: libs
-Priority: optional
-Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqca-dev, libssl-dev
-Standards-Version: 3.8.4
-
-Package: tqca-tls
-Section: libs
-Architecture: any
-Replaces: tqca-tls (<< 4:14.0.0~)
-Breaks: tqca-tls (<< 4:14.0.0~)
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
- This is a plugin to provide SSL/TLS capability to programs that
- utilize the TQt Cryptographic Architecture (TQCA).
- .
- TQCA is a library providing an easy API for several cryptographic algorithms 
- to TQt programs.
- .
- At the moment only the tqca-tls plugin is packaged for debian, as it's
- used by the package 'psi'. The generic library and several other plugins
- will be packaged when upstream releases them.
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/copyright b/ubuntu/_base/dependencies/tqca-tls/debian/copyright
deleted file mode 100644
index e64397c08..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/copyright
+++ /dev/null
@@ -1,20 +0,0 @@
-This package was debianized by Jan Niehusmann <jan@debian.org> on
-Tue,  9 Dec 2003 19:30:45 +0100.
-
-It was downloaded from http://psi.affinix.com/?page=download
-
-
-Upstream Author: Justin Karneges <justin-psi@affinix.com>
-
-Copyright: 
-
-Copyright (C) 2003  Justin Karneges
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in /usr/share/common-licenses/LGPL file.
-
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/patches/series b/ubuntu/_base/dependencies/tqca-tls/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/patches/series
+++ /dev/null
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/rules b/ubuntu/_base/dependencies/tqca-tls/debian/rules
deleted file mode 100755
index d3e967902..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/rules
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/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_CMAKE_EXTRA_FLAGS := \
- -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
- -DCMAKE_INSTALL_PREFIX="/usr" \
- -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" \
- -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/source/format b/ubuntu/_base/dependencies/tqca-tls/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/dependencies/tqca-tls/debian/source/options b/ubuntu/_base/dependencies/tqca-tls/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/dependencies/tqca-tls/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*
diff --git a/ubuntu/_base/dependencies/tqca/debian/control b/ubuntu/_base/dependencies/tqca/debian/control
index 854f98e7a..f3f6d4d7b 100644
--- a/ubuntu/_base/dependencies/tqca/debian/control
+++ b/ubuntu/_base/dependencies/tqca/debian/control
@@ -1,8 +1,8 @@
-Source: libtqca
+Source: tqca
 Section: libs
 Priority: optional
 Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
-Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev
+Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtqtinterface-dev, libssl-dev
 Standards-Version: 3.8.3
 
 Package: libtqca
@@ -23,3 +23,21 @@ Description:
  .
  This is the development package containing header files and link
  libraries for libtqca.
+
+Package: tqca-tls
+Section: libs
+Architecture: any
+Multi-Arch: foreign
+Replaces: tqca-tls (<< 4:14.0.0~)
+Breaks: tqca-tls (<< 4:14.0.0~)
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: TLS plugin for the TQt Cryptographic Architecture (TQCA)
+ This is a plugin to provide SSL/TLS capability to programs that
+ utilize the TQt Cryptographic Architecture (TQCA).
+ .
+ TQCA is a library providing an easy API for several cryptographic algorithms
+ to TQt programs.
+ .
+ At the moment only the tqca-tls plugin is packaged for debian, as it's
+ used by the package 'psi'. The generic library and several other plugins
+ will be packaged when upstream releases them.
diff --git a/ubuntu/_base/dependencies/tqca/debian/libtqca.docs b/ubuntu/_base/dependencies/tqca/debian/libtqca.docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqca/debian/libtqca.docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/_base/dependencies/tqca/debian/rules b/ubuntu/_base/dependencies/tqca/debian/rules
index 21df58b4f..bcf875516 100755
--- a/ubuntu/_base/dependencies/tqca/debian/rules
+++ b/ubuntu/_base/dependencies/tqca/debian/rules
@@ -16,4 +16,5 @@ DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
  -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
+ -DBUILD_ALL="ON" \
  -DWITH_ALL_OPTIONS="ON"
diff --git a/ubuntu/_base/dependencies/tqca/debian/tqca-tls.docs b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.docs
new file mode 100644
index 000000000..e845566c0
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.docs
@@ -0,0 +1 @@
+README
diff --git a/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install
new file mode 100644
index 000000000..893c5dd19
--- /dev/null
+++ b/ubuntu/_base/dependencies/tqca/debian/tqca-tls.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/tqt3/plugins