summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2020-02-09 19:09:57 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2020-02-09 19:19:28 +0900
commit75c1a9e97b7e0bac3c335719729a479b09fa736e (patch)
tree007bd4868242dccfe47af49102fce1f48906f750
parent346b535e892fa3fc3e8ccfb944b19b569e38b6d0 (diff)
downloadtde-packaging-75c1a9e97b7e0bac3c335719729a479b09fa736e.tar.gz
tde-packaging-75c1a9e97b7e0bac3c335719729a479b09fa736e.zip
Kerry has been removed from TDE.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--debian/_base/applications/kerry/debian/cdbs/debian-tde.mk218
-rw-r--r--debian/_base/applications/kerry/debian/cdbs/versions.pl19
-rw-r--r--debian/_base/applications/kerry/debian/changelog99
-rw-r--r--debian/_base/applications/kerry/debian/compat1
-rw-r--r--debian/_base/applications/kerry/debian/control19
-rw-r--r--debian/_base/applications/kerry/debian/copyright35
-rw-r--r--debian/_base/applications/kerry/debian/patches/series0
-rw-r--r--debian/_base/applications/kerry/debian/postinst13
-rw-r--r--debian/_base/applications/kerry/debian/postrm12
-rwxr-xr-xdebian/_base/applications/kerry/debian/rules19
-rw-r--r--debian/_base/applications/kerry/debian/source/format1
-rw-r--r--debian/_base/applications/kerry/debian/source/options6
-rw-r--r--redhat/Makefile5
-rw-r--r--redhat/applications/kerry/kerry.spec167
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec1
-rw-r--r--ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk218
-rw-r--r--ubuntu/_base/applications/kerry/debian/cdbs/versions.pl19
-rw-r--r--ubuntu/_base/applications/kerry/debian/changelog99
-rw-r--r--ubuntu/_base/applications/kerry/debian/compat1
-rw-r--r--ubuntu/_base/applications/kerry/debian/control19
-rw-r--r--ubuntu/_base/applications/kerry/debian/copyright35
-rw-r--r--ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch13
-rw-r--r--ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch18
-rw-r--r--ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch13
-rw-r--r--ubuntu/_base/applications/kerry/debian/patches/series3
-rw-r--r--ubuntu/_base/applications/kerry/debian/postinst13
-rw-r--r--ubuntu/_base/applications/kerry/debian/postrm12
-rwxr-xr-xubuntu/_base/applications/kerry/debian/rules19
-rw-r--r--ubuntu/_base/applications/kerry/debian/source/format1
-rw-r--r--ubuntu/_base/applications/kerry/debian/source/options6
30 files changed, 1 insertions, 1103 deletions
diff --git a/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk b/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk
deleted file mode 100644
index 7a55130b2..000000000
--- a/debian/_base/applications/kerry/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,218 +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
-
-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
-
-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
-
-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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-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 debian/stamp-kde-apidox
- rm -f debian/stamp-cvs-make
-
-endif
diff --git a/debian/_base/applications/kerry/debian/cdbs/versions.pl b/debian/_base/applications/kerry/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/debian/_base/applications/kerry/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/applications/kerry/debian/changelog b/debian/_base/applications/kerry/debian/changelog
deleted file mode 100644
index 3f36fe40e..000000000
--- a/debian/_base/applications/kerry/debian/changelog
+++ /dev/null
@@ -1,99 +0,0 @@
-kerry-trinity (1:0.2.1-0ubuntu6) lucid; urgency=low
-
- * Trinity Lucid rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 14 Aug 2010 10:00:00 -0600
-
-kerry (1:0.2.1-0ubuntu5) hardy; urgency=low
-
- * Add patch kubuntu_08_libbeagle1_transition.patch to make configure
- use libbeagle1, so binary objects are built. (LP: #211591).
- * Add patch kubuntu_09_remove-sh.patch to remove .sh extension
- from beagled-shutdown script.
- * Add postinst and postrm scripts to run ldconfig when kerry is
- installed or removed.
- * denian/rules: remove rpath from the binary and library files.
- * debian/control:
- - set minimum version of libbeagle-dev to 0.3.0 in build-depends.
- - add chrpath to build-depends.
- - bump standards-version to 3.7.3, no further changes needed.
- - move Homepage from description to control fields.
- * Update kubuntu_04_no_core_kmenu_entry.desktop.patch to remove
- deprecated encoding field.
- * Add patch kubuntu_10_update-kcmbeagle-desktop.patch to remove
- deprecated encoding field from the kcmbeagle desktop file.
-
- -- Albert Damen <albrt@gmx.net> Tue, 08 Apr 2008 21:50:06 +0200
-
-kerry (1:0.2.1-0ubuntu4) hardy; urgency=low
-
- * Rebuild for libbeagle0 -> libbeagle1 transition (LP: #192262).
-
- -- Andrea Colangelo <warp10@libero.it> Sat, 16 Feb 2008 00:02:29 +0100
-
-kerry (1:0.2.1-0ubuntu3) gutsy; urgency=low
-
- * Added kubuntu_06_knotes_integration.patch to fix knotes integration
- failing to open a note, opening an empty note instead
- * kubuntu_07_french_translation.patch for complete french translation
-
- -- Anthony Mercatante <tonio@ubuntu.com> Sat, 30 Jun 2007 01:14:05 +0200
-
-kerry (1:0.2.1-0ubuntu2) feisty; urgency=low
-
- * Build-Depends on libbeagle-dev instead of beagle-dev to actually compile
- kerry (Closes: Malone #76773)
-
- -- Adrien Cunin <adri2000@gmail.com> Thu, 18 Jan 2007 12:33:38 +0100
-
-kerry (1:0.2.1-0ubuntu1) feisty; urgency=low
-
- * New upstream release.
-
- -- Anthony Mercatante <tonio@ubuntu.com> Tue, 05 Dec 2006 18:03:31 +0100
-
-kerry (1:0.1-0ubuntu2) dapper; urgency=low
-
- * kubuntu_05_shortkey.diff: Change main key combo to stop clashing with
- YaKuake this time.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sun, 09 Apr 2006 21:14:46 +0200
-
-kerry (1:0.1-0ubuntu1) dapper; urgency=low
-
- * New upstream release.
- * Patched up patches.
- * Removed makebuilddir/kerry from debian/rules: no longer necessary.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sun, 09 Apr 2006 11:35:34 +0200
-
-kerry (0.09-0ubuntu4) dapper; urgency=low
-
- * Added kubuntu_05_shortkey.diff: Remove Alt-Space shortcut to stop
- conflicting with Katapult.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Fri, 07 Apr 2006 21:11:45 +0200
-
-kerry (0.09-0ubuntu3) dapper; urgency=low
-
- * Added kubuntu_04_no_core_kmenu_entry.desktop.patch to avoid double entry
- in Kmenu
-
- -- Anthony Mercatante <tonio@ubuntu.com> Tue, 29 Mar 2006 3:30:37 +0100
-
-kerry (0.09-0ubuntu2) dapper; urgency=low
-
- * Switched to cdbs
- * Added kubuntu_01_kdepot.patch for pot file extraction to Rosetta
- * kubuntu_01_kerry.diff becomes kubuntu_02_fix_shutdown_script_path.patch
- * Added kubuntu_03_no_beagle_autostart.diff to remove autostart desktop file
- for beagle as new beagle package already has it
-
- -- Anthony Mercatante <tonio@ubuntu.com> Mon, 28 Mar 2006 20:50:37 +0100
-
-kerry (0.09-0ubuntu1) dapper; urgency=low
-
- * Initial release.
- * Created kubuntu_01_kerry.diff - install scripts to /usr/bin.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sun, 26 Mar 2006 15:51:20 +0200
diff --git a/debian/_base/applications/kerry/debian/compat b/debian/_base/applications/kerry/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/debian/_base/applications/kerry/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/debian/_base/applications/kerry/debian/control b/debian/_base/applications/kerry/debian/control
deleted file mode 100644
index 65dd5a7ac..000000000
--- a/debian/_base/applications/kerry/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: kerry-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-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
-
-Package: kerry-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
-Replaces: kerry-trinity (<< 4:14.0.0~)
-Breaks: kerry-trinity (<< 4:14.0.0~)
-Description: a TDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a Trinity frontend for the Beagle desktop search daemon.
- .
- A program for indexing and searching user's data. At the moment, it can index
- filesystems, chat logs, mail and data, RSS and other.
- .
diff --git a/debian/_base/applications/kerry/debian/copyright b/debian/_base/applications/kerry/debian/copyright
deleted file mode 100644
index 96a9180c9..000000000
--- a/debian/_base/applications/kerry/debian/copyright
+++ /dev/null
@@ -1,35 +0,0 @@
-This package was debianized by Jonathan Patrick Davies <jpatrick@ubuntu.com> on
-Sun, 26 Mar 2006 15:51:20 +0200.
-
-It was downloaded from http://www.kde-apps.org/content/show.php?content=36832
-
-Upstream Authors: Stephan Binner <binner@kde.org>
- Debajyoti Bera <dbera.web@gmail.com>
-
-
-Copyright:
- Copyright (C) 2005 Novell, Inc.
- Copyright (C) 2005 Petri Damst�n <petri.damsten@iki.fi>
- Copyright (C) 2005 Debajyoti Bera <dbera.web@gmail.com>
- Copyright (C) 1998 Kurt Granroth <granroth@kde.org>
- Copyright (C) 2000 Peter Putzer <putzer@kde.org>
- Copyright (C) 2005 Jaroslaw Staniek <js@iidea.pl>
-
-License:
- 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 of the License, 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/_base/applications/kerry/debian/patches/series b/debian/_base/applications/kerry/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/_base/applications/kerry/debian/patches/series
+++ /dev/null
diff --git a/debian/_base/applications/kerry/debian/postinst b/debian/_base/applications/kerry/debian/postinst
deleted file mode 100644
index d0ff50431..000000000
--- a/debian/_base/applications/kerry/debian/postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kerry-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/kerry/debian/postrm b/debian/_base/applications/kerry/debian/postrm
deleted file mode 100644
index d1ae3b96c..000000000
--- a/debian/_base/applications/kerry/debian/postrm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# postrm script for kerry-trinity
-
-set -e
-
-if [ "$1" = "remove" ] ; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/_base/applications/kerry/debian/rules b/debian/_base/applications/kerry/debian/rules
deleted file mode 100755
index cee2a3058..000000000
--- a/debian/_base/applications/kerry/debian/rules
+++ /dev/null
@@ -1,19 +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_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" \
- -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/kerry/debian/source/format b/debian/_base/applications/kerry/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/debian/_base/applications/kerry/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/debian/_base/applications/kerry/debian/source/options b/debian/_base/applications/kerry/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/debian/_base/applications/kerry/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/redhat/Makefile b/redhat/Makefile
index 2a7b616a8..8758c4cf2 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -26,7 +26,7 @@ all: dependencies main libraries applications i18n meta
dependencies: tqt3 tqtinterface akode arts libart_lgpl libcaldav libcarddav sip4-tqt tqca tqca-tls avahi-tqt dbus-tqt dbus-1-tqt
main: tdelibs tdebase tdeaccessibility tdeadmin tdegames tdemultimedia tdepim tdetoys tdevelop tdeaddons tdeartwork tdebindings tdeedu tdegraphics tdenetwork tdesdk tdeutils tdewebdev
libraries: kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel libtdeldap libtqt-perl pytdeextensions python-trinity
-applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kerry kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
+applications: abakus amarok basket bibletime digikam dolphin filelight gtk3-tqt-engine gtk-qt-engine gwenview k3b k9copy kaffeine kaffeine-mozilla kasablanca katapult kbarcode kbfx kbibtex kbiff kbookreader kchmviewer kcmautostart kcmldap kcmldapcontroller kcmldapmanager kcpuload kdbg kdbusnotification kdiff3 kdirstat keep kerberostray kftpgrabber kile kima kiosktool kkbswitch klcddimmer kmplayer kmyfirewall kmymoney knemo knetload knetstats knetworkmanager8 knights knmap knowit knutclient koffice konversation kopete-otr kpicosim kpilot krecipes krename krusader kscope ksensors kshowmail kshutdown ksplash-engine-moodin ksquirrel kstreamripper ksystemlog ktechlab ktorrent kvirc kvkbd kvpnc mplayerthumbs piklab potracegui qt4-tqt-theme-engine rosegarden smartcardauth smb4k soundkonverter tde-guidance tdeio-apt tdeio-ftps tdeio-locate tdeio-sword tdeio-umountwrapper tdenetworkmanager tdepowersave tderadio tde-style-lipstik tde-style-qtcurve tdesudo tdesvn tde-systemsettings tdmtheme tellico tork twin-style-crystal wlassistant yakuake
i18n: gwenview-i18n k3b-i18n koffice-i18n tde-i18n
extras: icons-crystalsvg-updated icons-kfaenza icons-nuvola icons-oxygen kdevmon kdissert klibido kompose koverartist kpacman mathemagics png2qrgb
@@ -335,9 +335,6 @@ keep: tdebase rdiff-backup
kerberostray: tdebase
$(call buildpkg,applications/kerberostray)
-kerry: tdebase libbeagle
- $(call buildpkg,applications/kerry)
-
kftpgrabber: tdebase
$(call buildpkg,applications/kftpgrabber)
diff --git a/redhat/applications/kerry/kerry.spec b/redhat/applications/kerry/kerry.spec
deleted file mode 100644
index 65ef18872..000000000
--- a/redhat/applications/kerry/kerry.spec
+++ /dev/null
@@ -1,167 +0,0 @@
-#
-# spec file for package kerry (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# Default version for this component
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.7
-%endif
-
-# TDE specific building variables
-%define tde_pkg kerry
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name: trinity-%{tde_pkg}
-Summary: a TDE frontend for the Beagle desktop search daemon [Trinity]
-Version: 0.2.1
-Release: %{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-
-License: GPLv2+
-Group: Applications/Utilities
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://en.opensuse.org/Kerry
-
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-arts-devel >= 1:1.5.10
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
-BuildRequires: trinity-tdebase-devel >= %{tde_version}
-BuildRequires: desktop-file-utils
-
-BuildRequires: cmake >= 2.8
-BuildRequires: gettext
-BuildRequires: libbeagle-devel >= 0.3.0
-
-# ACL support
-BuildRequires: libacl-devel
-
-# IDN support
-BuildRequires: libidn-devel
-
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-BuildRequires: docbook2x
-%else
-BuildRequires: docbook2X
-%endif
-
-%description
-Kerry is a Trinity frontend for the Beagle desktop search daemon.
-
-A program for indexing and searching user's data. At the moment, it can index
-filesystems, chat logs, mail and data, RSS and other.
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-
-%build
-unset QTDIR QTINC QTLIB
-export PATH="%{tde_bindir}:${PATH}"
-export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-
-if ! rpm -E %%cmake|grep -q "cd build"; then
- %__mkdir_p build
- cd build
-fi
-
-%cmake \
- -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
- -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
- -DCMAKE_SKIP_RPATH=OFF \
- -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
- -DCMAKE_VERBOSE_MAKEFILE=ON \
- -DWITH_GCC_VISIBILITY=OFF \
- \
- -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
- -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
- -DLIB_INSTALL_DIR="%{tde_libdir}" \
- -DPLUGIN_INSTALL_DIR="%{tde_tdelibdir}" \
- \
- -DWITH_ALL_OPTIONS=ON \
- -DWITH_GCC_VISIBILITY=ON \
- \
- -DBUILD_ALL=ON \
- -DBUILD_DOC=ON \
- -DBUILD_TRANSLATIONS=ON \
- \
- ..
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot} -C build
-
-
-%find_lang %{tde_pkg}
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%{tde_datadir}/locale/*/LC_MESSAGES/kcmbeagle.mo
-%{tde_bindir}/beagled-shutdown
-%{tde_bindir}/kerry
-%{tde_libdir}/libtdeinit_kerry.la
-%{tde_libdir}/libtdeinit_kerry.so
-%{tde_tdelibdir}/kcm_beagle.la
-%{tde_tdelibdir}/kcm_beagle.so
-%{tde_tdelibdir}/kerry.la
-%{tde_tdelibdir}/kerry.so
-%{tde_tdeappdir}/kcmbeagle.desktop
-%{tde_tdeappdir}/kerry.desktop
-%{tde_datadir}/applnk/.hidden/kcmkerry.desktop
-%{tde_datadir}/apps/kerry/
-%{tde_datadir}/autostart/beagled.desktop
-%{tde_datadir}/autostart/kerry.autostart.desktop
-%{tde_datadir}/icons/hicolor/*/*/*
-%{tde_mandir}/man1/kerry.*
-
-
-%changelog
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index bff1cb7de..024c38cad 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -134,7 +134,6 @@ Requires: trinity-kdiff3
Requires: trinity-kdirstat
Requires: trinity-keep
Requires: trinity-kerberostray
-Requires: trinity-kerry
Requires: trinity-kftpgrabber
Requires: trinity-kile
Requires: trinity-kima
diff --git a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk b/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
deleted file mode 100644
index 7a55130b2..000000000
--- a/ubuntu/_base/applications/kerry/debian/cdbs/debian-tde.mk
+++ /dev/null
@@ -1,218 +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
-
-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
-
-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
-
-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),+$(DEB_MAKE_INVOKE) install-apidox DESTDIR=$(DEB_DESTDIR))
-
-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 debian/stamp-kde-apidox
- rm -f debian/stamp-cvs-make
-
-endif
diff --git a/ubuntu/_base/applications/kerry/debian/cdbs/versions.pl b/ubuntu/_base/applications/kerry/debian/cdbs/versions.pl
deleted file mode 100644
index 1b110f7af..000000000
--- a/ubuntu/_base/applications/kerry/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/applications/kerry/debian/changelog b/ubuntu/_base/applications/kerry/debian/changelog
deleted file mode 100644
index 3f36fe40e..000000000
--- a/ubuntu/_base/applications/kerry/debian/changelog
+++ /dev/null
@@ -1,99 +0,0 @@
-kerry-trinity (1:0.2.1-0ubuntu6) lucid; urgency=low
-
- * Trinity Lucid rebuild
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net> Sat, 14 Aug 2010 10:00:00 -0600
-
-kerry (1:0.2.1-0ubuntu5) hardy; urgency=low
-
- * Add patch kubuntu_08_libbeagle1_transition.patch to make configure
- use libbeagle1, so binary objects are built. (LP: #211591).
- * Add patch kubuntu_09_remove-sh.patch to remove .sh extension
- from beagled-shutdown script.
- * Add postinst and postrm scripts to run ldconfig when kerry is
- installed or removed.
- * denian/rules: remove rpath from the binary and library files.
- * debian/control:
- - set minimum version of libbeagle-dev to 0.3.0 in build-depends.
- - add chrpath to build-depends.
- - bump standards-version to 3.7.3, no further changes needed.
- - move Homepage from description to control fields.
- * Update kubuntu_04_no_core_kmenu_entry.desktop.patch to remove
- deprecated encoding field.
- * Add patch kubuntu_10_update-kcmbeagle-desktop.patch to remove
- deprecated encoding field from the kcmbeagle desktop file.
-
- -- Albert Damen <albrt@gmx.net> Tue, 08 Apr 2008 21:50:06 +0200
-
-kerry (1:0.2.1-0ubuntu4) hardy; urgency=low
-
- * Rebuild for libbeagle0 -> libbeagle1 transition (LP: #192262).
-
- -- Andrea Colangelo <warp10@libero.it> Sat, 16 Feb 2008 00:02:29 +0100
-
-kerry (1:0.2.1-0ubuntu3) gutsy; urgency=low
-
- * Added kubuntu_06_knotes_integration.patch to fix knotes integration
- failing to open a note, opening an empty note instead
- * kubuntu_07_french_translation.patch for complete french translation
-
- -- Anthony Mercatante <tonio@ubuntu.com> Sat, 30 Jun 2007 01:14:05 +0200
-
-kerry (1:0.2.1-0ubuntu2) feisty; urgency=low
-
- * Build-Depends on libbeagle-dev instead of beagle-dev to actually compile
- kerry (Closes: Malone #76773)
-
- -- Adrien Cunin <adri2000@gmail.com> Thu, 18 Jan 2007 12:33:38 +0100
-
-kerry (1:0.2.1-0ubuntu1) feisty; urgency=low
-
- * New upstream release.
-
- -- Anthony Mercatante <tonio@ubuntu.com> Tue, 05 Dec 2006 18:03:31 +0100
-
-kerry (1:0.1-0ubuntu2) dapper; urgency=low
-
- * kubuntu_05_shortkey.diff: Change main key combo to stop clashing with
- YaKuake this time.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sun, 09 Apr 2006 21:14:46 +0200
-
-kerry (1:0.1-0ubuntu1) dapper; urgency=low
-
- * New upstream release.
- * Patched up patches.
- * Removed makebuilddir/kerry from debian/rules: no longer necessary.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sun, 09 Apr 2006 11:35:34 +0200
-
-kerry (0.09-0ubuntu4) dapper; urgency=low
-
- * Added kubuntu_05_shortkey.diff: Remove Alt-Space shortcut to stop
- conflicting with Katapult.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Fri, 07 Apr 2006 21:11:45 +0200
-
-kerry (0.09-0ubuntu3) dapper; urgency=low
-
- * Added kubuntu_04_no_core_kmenu_entry.desktop.patch to avoid double entry
- in Kmenu
-
- -- Anthony Mercatante <tonio@ubuntu.com> Tue, 29 Mar 2006 3:30:37 +0100
-
-kerry (0.09-0ubuntu2) dapper; urgency=low
-
- * Switched to cdbs
- * Added kubuntu_01_kdepot.patch for pot file extraction to Rosetta
- * kubuntu_01_kerry.diff becomes kubuntu_02_fix_shutdown_script_path.patch
- * Added kubuntu_03_no_beagle_autostart.diff to remove autostart desktop file
- for beagle as new beagle package already has it
-
- -- Anthony Mercatante <tonio@ubuntu.com> Mon, 28 Mar 2006 20:50:37 +0100
-
-kerry (0.09-0ubuntu1) dapper; urgency=low
-
- * Initial release.
- * Created kubuntu_01_kerry.diff - install scripts to /usr/bin.
-
- -- Jonathan Patrick Davies <jpatrick@ubuntu.com> Sun, 26 Mar 2006 15:51:20 +0200
diff --git a/ubuntu/_base/applications/kerry/debian/compat b/ubuntu/_base/applications/kerry/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/_base/applications/kerry/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/_base/applications/kerry/debian/control b/ubuntu/_base/applications/kerry/debian/control
deleted file mode 100644
index 0ae6c68f9..000000000
--- a/ubuntu/_base/applications/kerry/debian/control
+++ /dev/null
@@ -1,19 +0,0 @@
-Source: kerry-trinity
-Section: tde
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-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
-
-Package: kerry-trinity
-Architecture: any
-Depends: ${shlibs:Depends}, beagle (>= 0.2.3)
-Replaces: kerry-kde3 (<< 4:14.0.0~), kerry-trinity (<< 4:14.0.0~)
-Breaks: kerry-kde3 (<< 4:14.0.0~), kerry-trinity (<< 4:14.0.0~)
-Description: a TDE frontend for the Beagle desktop search daemon [Trinity]
- Kerry is a Trinity frontend for the Beagle desktop search daemon.
- .
- A program for indexing and searching user's data. At the moment, it can index
- filesystems, chat logs, mail and data, RSS and other.
- .
diff --git a/ubuntu/_base/applications/kerry/debian/copyright b/ubuntu/_base/applications/kerry/debian/copyright
deleted file mode 100644
index 96a9180c9..000000000
--- a/ubuntu/_base/applications/kerry/debian/copyright
+++ /dev/null
@@ -1,35 +0,0 @@
-This package was debianized by Jonathan Patrick Davies <jpatrick@ubuntu.com> on
-Sun, 26 Mar 2006 15:51:20 +0200.
-
-It was downloaded from http://www.kde-apps.org/content/show.php?content=36832
-
-Upstream Authors: Stephan Binner <binner@kde.org>
- Debajyoti Bera <dbera.web@gmail.com>
-
-
-Copyright:
- Copyright (C) 2005 Novell, Inc.
- Copyright (C) 2005 Petri Damst�n <petri.damsten@iki.fi>
- Copyright (C) 2005 Debajyoti Bera <dbera.web@gmail.com>
- Copyright (C) 1998 Kurt Granroth <granroth@kde.org>
- Copyright (C) 2000 Peter Putzer <putzer@kde.org>
- Copyright (C) 2005 Jaroslaw Staniek <js@iidea.pl>
-
-License:
- 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 of the License, 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.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
deleted file mode 100644
index 7b06f8128..000000000
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_03_no_beagle_autostart.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/kerry/src/Makefile.am
-===================================================================
---- a/kerry/src/Makefile.am
-+++ b/kerry/src/Makefile.am
-@@ -31,7 +31,7 @@
- kerry_la_LIBADD = -ltdeio -lkonq $(LIB_TDEUI) $(LIBBEAGLE_LIBADD) $(GLIB_LIBADD) $(LIB_TDEABC) -lDCOP $(LIB_QT) $(LIB_TDECORE)
-
- autostartdir = $(datadir)/autostart
--autostart_DATA = kerry.autostart.desktop beagled.desktop
-+autostart_DATA = kerry.autostart.desktop
-
- shutdowndir = $(prefix)/bin
- shutdown_SCRIPTS = beagled-shutdown
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
deleted file mode 100644
index 07576f0eb..000000000
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_04_no_core_kmenu_entry.desktop.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur -x '*.orig' -x '*~' kerry-0.2.1/kerry/src/kerry.desktop kerry-0.2.1.new/kerry/src/kerry.desktop
---- kerry-0.2.1/kerry/src/kerry.desktop 2006-12-04 14:35:38.000000000 +0100
-+++ kerry-0.2.1.new/kerry/src/kerry.desktop 2008-04-08 22:55:31.000000000 +0200
-@@ -1,5 +1,4 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=Kerry Beagle
- GenericName=Desktop Search
- GenericName[ar]=بحث على سطح المكتب
-@@ -25,7 +24,7 @@
- Exec=kerry --show-searchdialog
- Icon=kerry
- Type=Application
--Categories=Qt;TDE;Application;Core;Utility;Filesystem;
-+Categories=Qt;TDE;Application;Utility;Filesystem;
- Terminal=false
- X-DCOP-ServiceType=Unique
- X-TDE-StartupNotify=false
diff --git a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
deleted file mode 100644
index c4a705c68..000000000
--- a/ubuntu/_base/applications/kerry/debian/patches/kubuntu_05_shortkey.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp.cpp
---- kerry-0.2.1/kerry/src/kerryapp.cpp
-+++ kerry-0.2.1.new/kerry/src/kerryapp.cpp
-@@ -122,8 +122,7 @@
- globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this));
- globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") );
-
-- TDEShortcut showDialogShortcut = TDEShortcut(ALT+Key_Space);
-- showDialogShortcut.append( KKey( Key_F12 ) );
-+ TDEShortcut showDialogShortcut = TDEShortcut(CTRL+SHIFT+Key_Space);
- globalKeys->insert( "Show Kerry Dialog", i18n("Show Search Dialog"), TQString(), showDialogShortcut, showDialogShortcut, TQT_TQOBJECT(hitListWindow), TQT_SLOT(showSearchDialog()) );
- globalKeys->insert( "Search Primary Selection with Kerry", i18n("Search Primary Selection"), TQString(), CTRL+ALT+Key_Space, CTRL+ALT+Key_Space, TQT_TQOBJECT(this), TQT_SLOT(searchPrimarySelection()) );
- configChanged();
diff --git a/ubuntu/_base/applications/kerry/debian/patches/series b/ubuntu/_base/applications/kerry/debian/patches/series
deleted file mode 100644
index f23925f70..000000000
--- a/ubuntu/_base/applications/kerry/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-kubuntu_03_no_beagle_autostart.patch
-kubuntu_04_no_core_kmenu_entry.desktop.patch
-kubuntu_05_shortkey.patch
diff --git a/ubuntu/_base/applications/kerry/debian/postinst b/ubuntu/_base/applications/kerry/debian/postinst
deleted file mode 100644
index d0ff50431..000000000
--- a/ubuntu/_base/applications/kerry/debian/postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-# postinst script for kerry-trinity
-
-set -e
-
-if [ "$1" = "configure" ] ; then
- # force ldconfig due to tdeinit library
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/kerry/debian/postrm b/ubuntu/_base/applications/kerry/debian/postrm
deleted file mode 100644
index d1ae3b96c..000000000
--- a/ubuntu/_base/applications/kerry/debian/postrm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# postrm script for kerry-trinity
-
-set -e
-
-if [ "$1" = "remove" ] ; then
- ldconfig
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/ubuntu/_base/applications/kerry/debian/rules b/ubuntu/_base/applications/kerry/debian/rules
deleted file mode 100755
index cee2a3058..000000000
--- a/ubuntu/_base/applications/kerry/debian/rules
+++ /dev/null
@@ -1,19 +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_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" \
- -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/kerry/debian/source/format b/ubuntu/_base/applications/kerry/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/applications/kerry/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/_base/applications/kerry/debian/source/options b/ubuntu/_base/applications/kerry/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/applications/kerry/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 = .*