summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/tde-core/tde-tdebase/PKGBUILD10
-rw-r--r--arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff28
-rw-r--r--debian/_base/core/tdebase/debian/tdebase-data-trinity.install88
-rw-r--r--dilos/core/tdebase/debian/tdebase-data-trinity.install88
-rw-r--r--freebsd/core/tdebase/Makefile2
-rw-r--r--freebsd/core/tdebase/files/patch-bp000-fix-tiling-of-maximized-windows.diff28
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install88
l---------ubuntu/resolute (renamed from ubuntu/bionic)0
8 files changed, 69 insertions, 263 deletions
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index 5215412ff..85a6db207 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -7,7 +7,7 @@ _kdemod="${_mod/tde/kde}"
pkgname="tde-${_mod}"
pkgver=14.1.5
-pkgrel=1
+pkgrel=2
pkgdesc="Trinity Desktop Enviroment base components"
arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'powerpc64le')
url="https://scm.trinitydesktop.org/scm/git/${_mod}"
@@ -52,6 +52,7 @@ options=('staticlibs' 'libtool' '!strip')
install="trinity-${_mod}.install"
source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
+ 'bp000-fix-tiling-of-maximized-windows.diff'
'agent-shutdown.sh'
'agent-startup.sh'
'tdm-trinity'
@@ -60,6 +61,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
'xsession.patch')
md5sums=('d411d22bbce474ece21cf838e7491f41'
+ '235431ac1f009c0db8a34ddd22b034f8'
'18e8d01124b19f7df2937c06e177bf7f'
'c963ef6e37c9051119972a58c67f05fb'
'bb4c25e560fa719e8e8f49ef80bd1c99'
@@ -69,6 +71,12 @@ md5sums=('d411d22bbce474ece21cf838e7491f41'
[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+prepare() {
+ msg "Apply backported patches"
+ cd ${srcdir}/${pkgname#*-}-trinity-${pkgver} || exit 1
+ patch -p1 < ${srcdir}/bp000-fix-tiling-of-maximized-windows.diff
+}
+
build() {
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p ${srcdir}/build
diff --git a/arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff b/arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff
new file mode 100644
index 000000000..a4fe63d49
--- /dev/null
+++ b/arch/tde-core/tde-tdebase/bp000-fix-tiling-of-maximized-windows.diff
@@ -0,0 +1,28 @@
+commit 23b75093d5599baeb816bbf0163ade78d2201818
+Author: Michele Calgaro <michele.calgaro@yahoo.it>
+Date: Sat Nov 22 20:39:15 2025 +0900
+
+ twin: fix tiling of maximized windows. This resolves issue #675
+
+ Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
+ (cherry picked from commit d2b2363d9345e74035e0585344d7150c4a62ef1c)
+
+diff --git a/twin/geometry.cpp b/twin/geometry.cpp
+index 88d0ba8cd..bdef2356c 100644
+--- a/twin/geometry.cpp
++++ b/twin/geometry.cpp
+@@ -1915,12 +1915,12 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
+ TQRect clientArea = workspace()->clientArea( MaximizeArea, this );
+
+ // save sizes for restoring, if maximalizing
+- if( !activeTiled && !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
++ if( !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
+ {
+ geom_restore.setTop( y());
+ geom_restore.setHeight( height());
+ }
+- if( !activeTiled && !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
++ if( !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
+ {
+ geom_restore.setLeft( x());
+ geom_restore.setWidth( width());
diff --git a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
index 8131ae5b5..eb09b1d5d 100644
--- a/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/debian/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -496,93 +496,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop.p
debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-system.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/input-touchpad.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/laptop.png
-debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alexa_url.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alltheweb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/altavista.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/amg.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/appsy.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/austronaut.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/backports.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/bugft.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/bugno.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/call.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/cia.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/citeseer.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/cpan.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ctan_cat.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ctan.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/dbug.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/de2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/de2fr.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/deb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/dmoz.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/docbook.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/doi.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2de.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2es.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2fr.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2it.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/es2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/excite.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/feedster.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/foldoc.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fr2de.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fr2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/freedb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/freshmeat.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/froogle.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fsd.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_advanced.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_groups.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_images.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_lucky.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_movie.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_news.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/gracenote.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/grec.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hotbot.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary_thesaurus.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/imdb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/it2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/jeeves.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/katatudo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/kde.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/kde_websvn.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/leo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/lycos.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/mamma.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/metacrawler.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/msdn.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/netcraft.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/nl-telephone.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/nl-teletekst.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/pgpkeys.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/php.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/python.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/qt3.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/qt.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rae.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rfc.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rpmfind.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ruby_application_archive.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/seek.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/sourceforge.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/technorati.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/technoratitags.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/thesaurus.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/tvtome.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/uspto.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/vivisimo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/voila.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/webster.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop
+debian/tmp/opt/trinity/share/services/searchproviders/*.desktop
debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop
debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop
debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop
diff --git a/dilos/core/tdebase/debian/tdebase-data-trinity.install b/dilos/core/tdebase/debian/tdebase-data-trinity.install
index 4ee48f327..132ab8fe8 100644
--- a/dilos/core/tdebase/debian/tdebase-data-trinity.install
+++ b/dilos/core/tdebase/debian/tdebase-data-trinity.install
@@ -496,93 +496,7 @@ debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-desktop.png
debian/tmp/usr/share/icons/crystalsvg/*/categories/preferences-system.png
debian/tmp/usr/share/icons/crystalsvg/*/devices/input-touchpad.png
debian/tmp/usr/share/icons/crystalsvg/*/devices/laptop.png
-debian/tmp/usr/share/services/searchproviders/acronym.desktop
-debian/tmp/usr/share/services/searchproviders/alexa.desktop
-debian/tmp/usr/share/services/searchproviders/alexa_url.desktop
-debian/tmp/usr/share/services/searchproviders/alltheweb.desktop
-debian/tmp/usr/share/services/searchproviders/altavista.desktop
-debian/tmp/usr/share/services/searchproviders/amg.desktop
-debian/tmp/usr/share/services/searchproviders/appsy.desktop
-debian/tmp/usr/share/services/searchproviders/austronaut.desktop
-debian/tmp/usr/share/services/searchproviders/backports.desktop
-debian/tmp/usr/share/services/searchproviders/bugft.desktop
-debian/tmp/usr/share/services/searchproviders/bugno.desktop
-debian/tmp/usr/share/services/searchproviders/call.desktop
-debian/tmp/usr/share/services/searchproviders/cia.desktop
-debian/tmp/usr/share/services/searchproviders/citeseer.desktop
-debian/tmp/usr/share/services/searchproviders/cpan.desktop
-debian/tmp/usr/share/services/searchproviders/ctan_cat.desktop
-debian/tmp/usr/share/services/searchproviders/ctan.desktop
-debian/tmp/usr/share/services/searchproviders/dbug.desktop
-debian/tmp/usr/share/services/searchproviders/de2en.desktop
-debian/tmp/usr/share/services/searchproviders/de2fr.desktop
-debian/tmp/usr/share/services/searchproviders/deb.desktop
-debian/tmp/usr/share/services/searchproviders/dmoz.desktop
-debian/tmp/usr/share/services/searchproviders/docbook.desktop
-debian/tmp/usr/share/services/searchproviders/doi.desktop
-debian/tmp/usr/share/services/searchproviders/en2de.desktop
-debian/tmp/usr/share/services/searchproviders/en2es.desktop
-debian/tmp/usr/share/services/searchproviders/en2fr.desktop
-debian/tmp/usr/share/services/searchproviders/en2it.desktop
-debian/tmp/usr/share/services/searchproviders/es2en.desktop
-debian/tmp/usr/share/services/searchproviders/excite.desktop
-debian/tmp/usr/share/services/searchproviders/feedster.desktop
-debian/tmp/usr/share/services/searchproviders/foldoc.desktop
-debian/tmp/usr/share/services/searchproviders/fr2de.desktop
-debian/tmp/usr/share/services/searchproviders/fr2en.desktop
-debian/tmp/usr/share/services/searchproviders/freedb.desktop
-debian/tmp/usr/share/services/searchproviders/freshmeat.desktop
-debian/tmp/usr/share/services/searchproviders/froogle.desktop
-debian/tmp/usr/share/services/searchproviders/fsd.desktop
-debian/tmp/usr/share/services/searchproviders/google_advanced.desktop
-debian/tmp/usr/share/services/searchproviders/google.desktop
-debian/tmp/usr/share/services/searchproviders/google_groups.desktop
-debian/tmp/usr/share/services/searchproviders/google_images.desktop
-debian/tmp/usr/share/services/searchproviders/google_lucky.desktop
-debian/tmp/usr/share/services/searchproviders/google_movie.desktop
-debian/tmp/usr/share/services/searchproviders/google_news.desktop
-debian/tmp/usr/share/services/searchproviders/gracenote.desktop
-debian/tmp/usr/share/services/searchproviders/grec.desktop
-debian/tmp/usr/share/services/searchproviders/hotbot.desktop
-debian/tmp/usr/share/services/searchproviders/hyperdictionary.desktop
-debian/tmp/usr/share/services/searchproviders/hyperdictionary_thesaurus.desktop
-debian/tmp/usr/share/services/searchproviders/imdb.desktop
-debian/tmp/usr/share/services/searchproviders/it2en.desktop
-debian/tmp/usr/share/services/searchproviders/jeeves.desktop
-debian/tmp/usr/share/services/searchproviders/katatudo.desktop
-debian/tmp/usr/share/services/searchproviders/kde.desktop
-debian/tmp/usr/share/services/searchproviders/kde_websvn.desktop
-debian/tmp/usr/share/services/searchproviders/leo.desktop
-debian/tmp/usr/share/services/searchproviders/lycos.desktop
-debian/tmp/usr/share/services/searchproviders/mamma.desktop
-debian/tmp/usr/share/services/searchproviders/metacrawler.desktop
-debian/tmp/usr/share/services/searchproviders/msdn.desktop
-debian/tmp/usr/share/services/searchproviders/netcraft.desktop
-debian/tmp/usr/share/services/searchproviders/nl-telephone.desktop
-debian/tmp/usr/share/services/searchproviders/nl-teletekst.desktop
-debian/tmp/usr/share/services/searchproviders/pgpkeys.desktop
-debian/tmp/usr/share/services/searchproviders/php.desktop
-debian/tmp/usr/share/services/searchproviders/python.desktop
-debian/tmp/usr/share/services/searchproviders/qt3.desktop
-debian/tmp/usr/share/services/searchproviders/qt.desktop
-debian/tmp/usr/share/services/searchproviders/rae.desktop
-debian/tmp/usr/share/services/searchproviders/rfc.desktop
-debian/tmp/usr/share/services/searchproviders/rpmfind.desktop
-debian/tmp/usr/share/services/searchproviders/ruby_application_archive.desktop
-debian/tmp/usr/share/services/searchproviders/seek.desktop
-debian/tmp/usr/share/services/searchproviders/sourceforge.desktop
-debian/tmp/usr/share/services/searchproviders/technorati.desktop
-debian/tmp/usr/share/services/searchproviders/technoratitags.desktop
-debian/tmp/usr/share/services/searchproviders/thesaurus.desktop
-debian/tmp/usr/share/services/searchproviders/tvtome.desktop
-debian/tmp/usr/share/services/searchproviders/uspto.desktop
-debian/tmp/usr/share/services/searchproviders/vivisimo.desktop
-debian/tmp/usr/share/services/searchproviders/voila.desktop
-debian/tmp/usr/share/services/searchproviders/webster.desktop
-debian/tmp/usr/share/services/searchproviders/whatis.desktop
-debian/tmp/usr/share/services/searchproviders/wikipedia.desktop
-debian/tmp/usr/share/services/searchproviders/wiktionary.desktop
-debian/tmp/usr/share/services/searchproviders/wordref.desktop
+debian/tmp/usr/share/services/searchproviders/*.desktop
debian/tmp/usr/share/services/useragentstrings/*.desktop
debian/tmp/usr/share/servicetypes/searchprovider.desktop
debian/tmp/usr/share/servicetypes/uasprovider.desktop
diff --git a/freebsd/core/tdebase/Makefile b/freebsd/core/tdebase/Makefile
index c6af1da3f..57e06087c 100644
--- a/freebsd/core/tdebase/Makefile
+++ b/freebsd/core/tdebase/Makefile
@@ -11,7 +11,7 @@ PORTNAME= tdebase-trinity
COMMENT= Trinity Base Programs
TDE_PREVERSION=
MASTER_SITE_SUBDIR= t/${PORTNAME}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= x11
DIST_SUBDIR= TDE/core
diff --git a/freebsd/core/tdebase/files/patch-bp000-fix-tiling-of-maximized-windows.diff b/freebsd/core/tdebase/files/patch-bp000-fix-tiling-of-maximized-windows.diff
new file mode 100644
index 000000000..a4fe63d49
--- /dev/null
+++ b/freebsd/core/tdebase/files/patch-bp000-fix-tiling-of-maximized-windows.diff
@@ -0,0 +1,28 @@
+commit 23b75093d5599baeb816bbf0163ade78d2201818
+Author: Michele Calgaro <michele.calgaro@yahoo.it>
+Date: Sat Nov 22 20:39:15 2025 +0900
+
+ twin: fix tiling of maximized windows. This resolves issue #675
+
+ Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
+ (cherry picked from commit d2b2363d9345e74035e0585344d7150c4a62ef1c)
+
+diff --git a/twin/geometry.cpp b/twin/geometry.cpp
+index 88d0ba8cd..bdef2356c 100644
+--- a/twin/geometry.cpp
++++ b/twin/geometry.cpp
+@@ -1915,12 +1915,12 @@ void Client::changeMaximize( bool vertical, bool horizontal, bool adjust )
+ TQRect clientArea = workspace()->clientArea( MaximizeArea, this );
+
+ // save sizes for restoring, if maximalizing
+- if( !activeTiled && !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
++ if( !adjust && !( y() == clientArea.top() && height() == clientArea.height()))
+ {
+ geom_restore.setTop( y());
+ geom_restore.setHeight( height());
+ }
+- if( !activeTiled && !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
++ if( !adjust && !( x() == clientArea.left() && width() == clientArea.width()))
+ {
+ geom_restore.setLeft( x());
+ geom_restore.setWidth( width());
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
index 8131ae5b5..eb09b1d5d 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -496,93 +496,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop.p
debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-system.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/input-touchpad.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/laptop.png
-debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alexa_url.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/alltheweb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/altavista.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/amg.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/appsy.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/austronaut.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/backports.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/bugft.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/bugno.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/call.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/cia.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/citeseer.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/cpan.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ctan_cat.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ctan.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/dbug.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/de2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/de2fr.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/deb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/dmoz.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/docbook.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/doi.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2de.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2es.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2fr.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/en2it.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/es2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/excite.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/feedster.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/foldoc.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fr2de.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fr2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/freedb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/freshmeat.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/froogle.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/fsd.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_advanced.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_groups.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_images.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_lucky.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_movie.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/google_news.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/gracenote.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/grec.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hotbot.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/hyperdictionary_thesaurus.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/imdb.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/it2en.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/jeeves.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/katatudo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/kde.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/kde_websvn.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/leo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/lycos.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/mamma.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/metacrawler.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/msdn.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/netcraft.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/nl-telephone.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/nl-teletekst.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/pgpkeys.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/php.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/python.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/qt3.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/qt.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rae.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rfc.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/rpmfind.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/ruby_application_archive.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/seek.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/sourceforge.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/technorati.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/technoratitags.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/thesaurus.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/tvtome.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/uspto.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/vivisimo.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/voila.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/webster.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/whatis.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wikipedia.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wiktionary.desktop
-debian/tmp/opt/trinity/share/services/searchproviders/wordref.desktop
+debian/tmp/opt/trinity/share/services/searchproviders/*.desktop
debian/tmp/opt/trinity/share/services/useragentstrings/*.desktop
debian/tmp/opt/trinity/share/servicetypes/searchprovider.desktop
debian/tmp/opt/trinity/share/servicetypes/uasprovider.desktop
diff --git a/ubuntu/bionic b/ubuntu/resolute
index e7c887a6f..e7c887a6f 120000
--- a/ubuntu/bionic
+++ b/ubuntu/resolute